divB
26821a851b
2014-07-14 02:23:35 +00:00
jg123h12jh3y12g3y
09d9aa656e
2014-07-14 02:08:55 +00:00
jg123h12jh3y12g3y
5254ef67ba
2014-07-14 02:05:14 +00:00
Joey Hess
542a8288a8
fix build with path-pieces-0.1.4
2014-07-13 19:24:38 -04:00
Joey Hess
d4b6458efd
bug closure
2014-07-13 19:22:41 -04:00
sts
92c3c7f961
2014-07-13 09:04:24 +00:00
lex
48868f5b01
2014-07-13 06:52:38 +00:00
zardoz
a384c61d57
2014-07-12 20:12:36 +00:00
http://ypid.wordpress.com/
53210e3220
Added a comment: gitignore
2014-07-12 17:59:42 +00:00
http://svario.it/gioele
df53f96063
new feature: do not import new files
2014-07-12 14:18:59 +00:00
http://svario.it/gioele
68455bbe4e
New bug "sync does not commit with alwasycommit = false"
2014-07-12 10:59:49 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
2f54ec7727
Added a comment
2014-07-12 10:03:07 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
191477bb9f
Added a comment
2014-07-12 10:00:59 +00:00
http://svario.it/gioele
4059b9aefe
New topic "Recovering from a bad sync"
2014-07-12 09:00:19 +00:00
divB
f6b3f61c30
2014-07-12 02:28:32 +00:00
divB
0985ce2925
2014-07-12 02:07:46 +00:00
divB
58f1065fe5
Added a comment
2014-07-11 21:56:29 +00:00
divB
ebe00602b5
Added a comment
2014-07-11 21:43:11 +00:00
Joey Hess
398ad93afa
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-11 17:00:50 -04:00
Joey Hess
d71aaabeab
devblog
2014-07-11 17:00:20 -04:00
Joey Hess
822f4619ae
resolvemerge: finish up by committing
2014-07-11 16:59:49 -04:00
Joey Hess
61a35de433
Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files.
...
I think this is a git behavior change, but have not checked to be sure.
Conflict cruft used to look like $foo~HEAD, but now just $foo is left
behind as conflict cruft.
With test case.
2014-07-11 16:56:19 -04:00
Joey Hess
cb66ca3a76
resolvemerge: New plumbing command that runs the automatic merge conflict resolver.
2014-07-11 16:45:18 -04:00
http://joeyh.name/
e69d37a0ae
Added a comment
2014-07-11 20:17:06 +00:00
http://joeyh.name/
0f43fc0116
Added a comment
2014-07-11 19:57:36 +00:00
Joey Hess
003ebf58f5
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-11 15:53:02 -04:00
Joey Hess
aadf11cf99
moreinfo
2014-07-11 15:52:54 -04:00
http://joeyh.name/
ac152c1255
Added a comment
2014-07-11 19:46:05 +00:00
http://joeyh.name/
348866612f
Added a comment
2014-07-11 19:42:24 +00:00
http://joeyh.name/
7aff9410e0
Added a comment
2014-07-11 19:40:32 +00:00
http://joeyh.name/
53e1d72a30
Added a comment: unable to reproduce, please provide transcript
2014-07-11 19:36:37 +00:00
Joey Hess
793004e2c2
moreinfo
2014-07-11 15:34:41 -04:00
http://joeyh.name/
7003be56ad
Added a comment
2014-07-11 19:31:52 +00:00
http://joeyh.name/
d5ec73d200
Added a comment
2014-07-11 19:29:06 +00:00
Joey Hess
604740b720
S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it.
2014-07-11 15:21:43 -04:00
Joey Hess
50b1cd917a
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-11 14:52:57 -04:00
Joey Hess
c5f132e3e7
uninit: Avoid failing final removal in some direct mode repositories due to file modes.
...
Specifically .map files.
2014-07-11 14:52:53 -04:00
http://joeyh.name/
b88a04346a
Added a comment
2014-07-11 18:41:32 +00:00
Joey Hess
ee9ffcd940
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-11 14:30:59 -04:00
http://joeyh.name/
5636ba495b
Added a comment
2014-07-11 18:30:55 +00:00
Joey Hess
c5df45999f
make commented out lines always give the default, not a suggested setting
2014-07-11 14:30:36 -04:00
http://joeyh.name/
76ff54c246
Added a comment
2014-07-11 18:27:44 +00:00
http://joeyh.name/
694a44b464
Added a comment
2014-07-11 18:15:09 +00:00
Joey Hess
e8845fc9b5
close; local misconfiguration
2014-07-11 14:13:24 -04:00
http://joeyh.name/
ad1eabe61d
Added a comment: obvious questions
2014-07-11 18:12:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
da4be5c108
Added a comment
2014-07-11 18:10:06 +00:00
http://joeyh.name/
e265748fd7
Added a comment
2014-07-11 18:09:51 +00:00
Joey Hess
f22a77890e
improve documentation about sync
2014-07-11 14:08:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
91f834d20e
Added a comment
2014-07-11 17:11:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
6a2ae73f42
Added a comment
2014-07-11 17:06:43 +00:00
