Commit graph

18109 commits

Author SHA1 Message Date
Joey Hess
9659052e3f devblog 2015-07-10 17:56:56 -04:00
Joey Hess
dd54d9b617 Merge branch 'master' into optparse-applicative
Conflicts:
	debian/changelog
2015-07-10 17:07:54 -04:00
Joey Hess
8fd7052e5f add news item for git-annex 5.20150710 2015-07-10 17:02:37 -04:00
Joey Hess
92de60c490 fix man format 2015-07-10 16:52:53 -04:00
Joey Hess
b4d22e6d49 doc updates 2015-07-10 13:49:37 -04:00
peteraward@bd1992bc6d8ba02a8614d531c5b2e4df9b8815c6
1d3cb925d6 2015-07-10 00:40:43 +00:00
Joey Hess
820b92abab wip
Current status:

* building again, but several commands are commented out
* still need to implement global options, file matching options, etc
2015-07-09 19:03:24 -04:00
Joey Hess
e646051574 update fsck synopsis 2015-07-09 10:58:38 -04:00
Joey Hess
1090a3dcd7 Merge branch 'master' of ssh://git-annex.branchable.com 2015-07-08 20:25:10 -04:00
dave@2ab82f485adf7e2ce787066e35f5f9789bff430b
4eab9f7909 Added a comment: apt-get build-dep fails 2015-07-09 00:07:32 +00:00
Joey Hess
ad8194d1df devblog 2015-07-08 19:40:49 -04:00
sfowijowa
b25a819dc6 2015-07-08 23:28:50 +00:00
konubinix
c98135f39f Added a comment: Thank you for your answer 2015-07-08 19:33:35 +00:00
dirk.schmidt@045f26624b94d351628bbb315f94150d627fb18b
894415228b Added a comment: Webapp don open 2015-07-08 12:49:02 +00:00
ghen1
da61ec46f0 Added a comment 2015-07-08 04:08:28 +00:00
ghen1
6bc3771b66 2015-07-08 03:58:25 +00:00
acous
b5ccfa7023 Added a comment 2015-07-07 22:25:40 +00:00
Joey Hess
38215b7463 devblog 2015-07-07 17:38:02 -04:00
Joey Hess
b11d2f5a8a unused: --used-refspec can now be configured to look at refs in the reflog. This provides a way to not consider old versions of files to be unused after they have reached a specified age, when the old refs in the reflog expire.
May be slow.
2015-07-07 17:13:50 -04:00
Joey Hess
a51b98cdd5 sync: When annex.autocommit=false, avoid making any commit of local changes, while still merging with remote to the extent possible. 2015-07-07 16:36:11 -04:00
Joey Hess
81ad277a85 add: Stage symlinks the same as git add would, even if they are not a link to annexed content. 2015-07-07 16:15:30 -04:00
Joey Hess
772dd88ae9 close; use receive.denyCurrentBranch=updateInstead 2015-07-07 16:00:25 -04:00
Joey Hess
60fc25e9d3 merge: Avoid creating the synced/master branch.
The branch needs to be created when merging from the remote in sync,
since we diff between it and the remote's sync branch. But git annex merge
should not be creating sync branches.
2015-07-07 15:53:27 -04:00
Joey Hess
76bc0ce2a2 comment 2015-07-07 15:31:24 -04:00
Joey Hess
c6210902c0 merge 2 bugs 2015-07-07 15:12:03 -04:00
Joey Hess
1970c323c1 belated followup 2015-07-07 14:58:38 -04:00
Joey Hess
202f9bf06a comments 2015-07-07 14:50:47 -04:00
Joey Hess
99a99b3f65 followup 2015-07-07 14:08:30 -04:00
Joey Hess
0964628818 clarify 2015-07-07 13:49:58 -04:00
Joey Hess
53d1259df6 comment 2015-07-07 13:37:05 -04:00
Joey Hess
a59185da5f moreinfo 2015-07-07 13:00:58 -04:00
Joey Hess
78d60eef27 Merge branch 'master' of ssh://git-annex.branchable.com 2015-07-07 11:53:33 -04:00
etesial@f4797a6d725e971a2d41f3cbcf174991da178c29
91461f26b7 Added a comment 2015-07-07 14:45:32 +00:00
robduff
cc869b0047 2015-07-07 12:56:32 +00:00
Joey Hess
f8a11a6ce8 add cjdns and tor also 2015-07-07 01:01:57 -04:00
Joey Hess
99362230bb update; mention snow and generalize the design some 2015-07-07 00:43:45 -04:00
sunny256
5436e10a96 Added a comment 2015-07-06 22:33:48 +00:00
Joey Hess
ad1ebcb1dc remove redundant options header 2015-07-06 18:22:27 -04:00
Joey Hess
efc3bcdba0 close 2015-07-06 18:18:57 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
61869298f5 2015-07-06 22:15:39 +00:00
Joey Hess
fcee3b2089 comment 2015-07-06 18:14:45 -04:00
Joey Hess
9273ae2766 Merge branch 'master' of ssh://git-annex.branchable.com 2015-07-06 18:12:18 -04:00
Joey Hess
d947035811 followup 2015-07-06 18:11:49 -04:00
boustanihani@93604388a6a2b8df16f3e34157232801a67c1021
07b09bb7aa Added a comment 2015-07-06 22:00:36 +00:00
Joey Hess
b0e872f129 devblog 2015-07-06 16:46:36 -04:00
Joey Hess
f4d07c5189 followup 2015-07-06 16:43:03 -04:00
Joey Hess
58e6d258c1 dup 2015-07-06 16:24:51 -04:00
Joey Hess
ba149973d6 followup and open bug 2015-07-06 16:20:57 -04:00
Joey Hess
c59e29ae40 try to tease out a coherent bug report 2015-07-06 16:05:56 -04:00
Joey Hess
33344a3266 comment 2015-07-06 16:02:17 -04:00