Commit graph

19623 commits

Author SHA1 Message Date
Joey Hess
d82b110da8
Merge branch 'master' into smudge 2015-12-21 17:12:46 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
24419103f3 2015-12-21 19:50:38 +00:00
frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac720
082ae2083c Added a comment 2015-12-21 17:47:13 +00:00
Joey Hess
d3240f4622
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-21 12:57:20 -04:00
Joey Hess
a8b398c1fa
addurl: Added --batch option. 2015-12-21 12:57:13 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
7505f0970a Added a comment 2015-12-21 15:46:53 +00:00
cbaines
b032015f57 Added a comment 2015-12-21 13:33:34 +00:00
frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac720
f67862644b Added a comment 2015-12-21 13:08:49 +00:00
cbaines
6eedcc3a3e Added a comment 2015-12-21 12:40:52 +00:00
cbaines
8def2688c4 Added a comment 2015-12-21 12:32:55 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
bbfa501f4a Added a comment 2015-12-21 06:02:21 +00:00
jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565
466a249291 Added a comment: A problem with SmartGit then? 2015-12-21 03:21:59 +00:00
frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac720
29ea9f3782 2015-12-20 21:43:57 +00:00
sts
3bd5cbc131 Added a comment 2015-12-20 19:49:27 +00:00
Joey Hess
4e226d2cd2
update 2015-12-19 14:33:10 -04:00
Joey Hess
02dc62e2d3
reuse comment 2015-12-19 14:29:40 -04:00
Joey Hess
2c014e97dd
comment 2015-12-19 14:27:22 -04:00
Joey Hess
962c5ee0db
comment 2015-12-19 14:19:24 -04:00
Joey Hess
f5b103b455
comment 2015-12-19 14:07:57 -04:00
Joey Hess
7588e2fba7
comment 2015-12-19 13:59:03 -04:00
Joey Hess
9deaf4f1d9
comment 2015-12-19 13:55:28 -04:00
Joey Hess
d215acf6ef
comment 2015-12-19 13:51:26 -04:00
Joey Hess
fa1e9a9ee9
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-19 13:47:01 -04:00
Joey Hess
35827e2705
status: On crippled filesystems, was displaying M for all annexed files that were present. Probably caused by a change to what git status displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files. 2015-12-19 13:36:40 -04:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
df181d5a38 2015-12-19 06:52:08 +00:00
Joey Hess
9d19a60349
add news item for git-annex 5.20151218 2015-12-18 14:48:04 -04:00
neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd
5008846f7b Added a comment 2015-12-18 18:09:54 +00:00
Joey Hess
fbf6c25de5
interaction with shared clones 2015-12-17 18:46:52 -04:00
SamuelTardieu
7b73f343ae Added a comment 2015-12-17 11:15:55 +00:00
jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565
a604f7cd93 2015-12-17 02:25:02 +00:00
pete.ward@26c41318616c4cf9601d0431557c1df734ccdb77
ffefc488f4 2015-12-16 22:15:17 +00:00
Joey Hess
0914d33b21
Merge branch 'master' of ssh://git-annex.branchable.com 2015-12-16 17:05:12 -04:00
Joey Hess
ca9b84754d
devblog 2015-12-16 17:04:48 -04:00
Joey Hess
e55ac3d383
update 2015-12-16 17:04:31 -04:00
Joey Hess
e61f3d1752
update todo list 2015-12-16 16:02:21 -04:00
Joey Hess
a858a331c4
fix docs
"git -a annex.largefiles=* add" cannot be used.. git does not pass the
config along to the smudge filter, sadly.
2015-12-16 16:00:41 -04:00
Joey Hess
029111b89a
Merge branch 'master' into smudge 2015-12-16 13:07:46 -04:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
4a02a243f3 Added a comment 2015-12-16 11:21:48 +00:00
14.203.223.70
ff5de4ff57 poll vote (My phone (or MP3 player)) 2015-12-16 07:09:17 +00:00
Joey Hess
7800125783
starting to work on test suite for v6 2015-12-15 17:19:26 -04:00
Joey Hess
7d0e79b9e1
Use git-annex init --version=6 to get v6 for now
Not ready to make it default because of the direct mode upgrade needing to
all happen at once.
2015-12-15 17:17:13 -04:00
Joey Hess
db8b32254c
update todo list 2015-12-15 16:07:02 -04:00
Joey Hess
f9d077186a
implemented upgrade of direct mode repo to v6 2015-12-15 16:00:26 -04:00
Joey Hess
178dbe8cb1
doc update 2015-12-15 14:17:34 -04:00
Joey Hess
c7a066a3e4
fix incorrect doc change 2015-12-15 14:14:19 -04:00
Joey Hess
d1bb518e25
update doc for v6 2015-12-15 14:07:54 -04:00
Joey Hess
71e2050f8f
have clean filter check if the filename was already in use by an old key
The annex object for it may have been modified due to hard link, and
that should be cleaned up when the new version is added. If another
associated file has the old key's content, that's linked into the annex
object. Otherwise, update location log to reflect that content has been
lost.
2015-12-15 13:06:52 -04:00
Joey Hess
9fcc5046b3
todo 2015-12-15 12:38:32 -04:00
Joey Hess
f5d4ee9b63
Merge branch 'master' into smudge 2015-12-15 12:01:21 -04:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
555f5ae302 removed 2015-12-14 12:04:46 +00:00