Commit graph

20093 commits

Author SHA1 Message Date
Antoine Beaupré
d1dd9b5a4b respond 2016-04-09 00:41:41 -04:00
ExGen
196547ec8d Added a comment: comment 4 2016-04-08 22:00:33 +00:00
ExGen
f970490750 Added a comment: comment 3^^ 2016-04-08 21:03:15 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
c0008c0c53 2016-04-08 16:35:37 +00:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3 pull request for Bup.hs 2016-04-08 16:17:53 +00:00
Joey Hess
f41045bf19
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-06 19:32:01 -04:00
Joey Hess
555e235e1c
devbog 2016-04-06 19:26:25 -04:00
Joey Hess
64de6dcc74
one little bug.. 2016-04-06 19:23:32 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch 2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
2016-04-06 15:36:18 -04:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
c0ad345e45 2016-04-06 19:29:51 +00:00
Gus
03e679ce12 2016-04-06 16:05:42 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
3606b2746d Added a comment 2016-04-06 10:14:30 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
1c1a7bdaa4 Added a comment 2016-04-05 22:29:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
8f3c50cb27 Added a comment 2016-04-05 21:28:20 +00:00
Joey Hess
b9c16568ef
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-05 14:30:13 -04:00
Joey Hess
68ef108cb7
another reason 2016-04-05 14:29:33 -04:00
zarel
0fed223e4d Added a comment 2016-04-05 17:24:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
9d1c79d48d 2016-04-05 12:49:52 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
70b2621c01 2016-04-05 12:44:18 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
886f5b2d12 Added a comment 2016-04-05 09:19:59 +00:00
szrc
08897ff3a2 Added a comment 2016-04-05 01:18:53 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
ec0fcc8756 Added a comment 2016-04-04 21:21:56 +00:00
Joey Hess
9faf5c8837
devblog 2016-04-04 17:01:46 -04:00
Joey Hess
ea4ca877ce
comment 2016-04-04 17:01:08 -04:00
Joey Hess
398458b0d4
wording 2016-04-04 16:57:13 -04:00
Joey Hess
4c1f46262c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 16:52:47 -04:00
Joey Hess
db98ee6dc1
comment 2016-04-04 16:51:34 -04:00
Antoine Beaupré
d5e0469f68 comment 2016-04-04 16:51:14 -04:00
Antoine Beaupré
7a56f9e9e3 simplify manpage example and ask another question
sorry for the noise again...
2016-04-04 16:33:08 -04:00
Joey Hess
374e15663c
response 2016-04-04 16:32:38 -04:00
Joey Hess
20d15f70dd
response 2016-04-04 16:21:30 -04:00
Joey Hess
a3b7032936
comment 2016-04-04 16:16:38 -04:00
Joey Hess
6e576a5336
comment 2016-04-04 16:13:47 -04:00
Joey Hess
4a9b021543
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 16:10:39 -04:00
Joey Hess
5d1ad2b4b2
comment and improve docs 2016-04-04 16:10:05 -04:00
anarcat
7729ca4b14 Added a comment: clarified manpage 2016-04-04 20:00:40 +00:00
Joey Hess
d85d8b08d1
comment 2016-04-04 15:59:20 -04:00
anarcat
50ec2410f8 add examples on how to manually setup the remote keys setup by the assistant 2016-04-04 19:58:43 +00:00
Joey Hess
8e9820d491
comment 2016-04-04 15:55:50 -04:00
anarcat
7c5f43affb ugh. so it works with ~/.ssh/git-annex 2016-04-04 19:51:50 +00:00
Joey Hess
eeb74958a3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 15:44:16 -04:00
Joey Hess
2046502407
v6: Close pointer file handles more quickly, to avoid problems on Windows.
Was using L.readFile, so the Handle would remain open until the garbage
collector got around to it. Changed to explicit open and close, so we know
it's always closed when the function returns.
2016-04-04 15:42:33 -04:00
Joey Hess
cfe274e6f7
comment 2016-04-04 15:22:43 -04:00
Joey Hess
52b838d17e
comment 2016-04-04 15:14:58 -04:00
Joey Hess
cc16de7a5b
comment 2016-04-04 15:02:39 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
953d3accdc Clarified CHECKURL-MULTI syntax 2016-04-04 19:00:04 +00:00
Joey Hess
775bf431c8
comment 2016-04-04 14:58:34 -04:00
Joey Hess
6416411ba1
comment 2016-04-04 14:52:43 -04:00
Joey Hess
f78cbd9f0d
todo 2016-04-04 14:38:29 -04:00