Commit graph

24789 commits

Author SHA1 Message Date
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
625303226d import: Fix failure of cross-device import on Windows.
As well as import, 2 other places ran "mv" manually, so changed them to use
moveFile as well.
2015-07-07 14:48:23 -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
f8bc2d159e clarify 2015-07-07 13:20:57 -04:00
Joey Hess
751f9c40ce On linux, pass --as-needed to linker to avoid linking with unused shared libraries including libyaml. 2015-07-07 13:19:13 -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
Joey Hess
cc89c52e20 response 2015-07-06 15:58:54 -04:00
Joey Hess
2dff2625ef git error message; user misconfiguration 2015-07-06 15:54:29 -04:00
Joey Hess
7ccdeb46c2 comment 2015-07-06 15:48:49 -04:00
Joey Hess
d5b44fa7e9 comment 2015-07-06 15:41:11 -04:00
Joey Hess
dbd41159e0 Support git's undocumented core.sharedRepository=2 value, which is equivilant to "world". 2015-07-06 15:33:44 -04:00
Joey Hess
48fd416206 reproduced 2015-07-06 15:13:12 -04:00
Joey Hess
895f7b8c45 followup 2015-07-06 15:08:17 -04:00
Joey Hess
1c2c086d51 response 2015-07-06 15:02:46 -04:00
Joey Hess
41c494fd76 comment 2015-07-06 15:00:00 -04:00
Joey Hess
578e2161cd response 2015-07-06 14:56:19 -04:00
Joey Hess
d7f671e471 respinse 2015-07-06 14:51:13 -04:00
Joey Hess
0080b2000f comment 2015-07-06 14:45:54 -04:00
Joey Hess
1351926329 response 2015-07-06 14:29:42 -04:00
Joey Hess
75ab9a5838 comment 2015-07-06 14:24:55 -04:00
Joey Hess
f7dc20595e refactor ls-tree params
All in one place to avoid bugs like 174da80ddc
2015-07-06 14:21:43 -04:00
Joey Hess
174da80ddc bugfix: Pass --full-tree when using git ls-files to get a list of files on the git-annex branch, so it works when run in a subdirectory. This bug affected git-annex unused, and potentially also transitions running code and other things. 2015-07-06 14:09:54 -04:00
Joey Hess
c9c63b092e reproduced this bug 2015-07-06 13:51:32 -04:00