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
zardoz
07c322752c
2014-07-11 13:27:00 +00:00
zardoz
4f0ca08ba5
Added a comment
2014-07-11 11:54:26 +00:00
zardoz
089a23b291
Added a comment
2014-07-11 11:46:08 +00:00
CandyAngel
3355275161
Added a comment
2014-07-11 10:57:58 +00:00
CandyAngel
f59fc3da9f
Added a comment
2014-07-11 10:41:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
ff6f62e544
2014-07-11 10:08:06 +00:00
http://svario.it/gioele
bcf5c41904
New bug: git-annex sync does not push
2014-07-11 09:25:14 +00:00
http://svario.it/gioele
b0eef01f37
Added a comment: GPG_AGENT_INFO was already set in the outside shell
2014-07-11 07:19:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
fac19f5b91
Added a comment: Install fails horribly
2014-07-10 23:11:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawndSPd52H_L7hcYsJjLQ4kR1LopprHy7Xw
3700fb00af
2014-07-10 22:37:59 +00:00
Joey Hess
f14890bf82
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-10 17:06:23 -04:00
Joey Hess
9d71903c2f
migrate: Avoid re-checksumming when migrating from hashE to hash backend.
2014-07-10 17:06:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk3JJvaarUKd7xShCMze_kpHVcuCzFrWTI
ab233c9a1c
2014-07-10 21:03:50 +00:00
Joey Hess
564de5e508
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-10 16:28:13 -04:00
Joey Hess
b66b33c87f
promote comment to todo
2014-07-10 16:27:12 -04:00
http://joeyh.name/
5553c4dcd6
Added a comment
2014-07-10 20:24:04 +00:00
http://joeyh.name/
6bfc13556f
Added a comment
2014-07-10 20:16:28 +00:00
http://joeyh.name/
fe80c9897a
Added a comment
2014-07-10 19:59:15 +00:00
http://joeyh.name/
29d2b5bf22
Added a comment
2014-07-10 19:54:30 +00:00
http://joeyh.name/
3a6cb53e96
Added a comment
2014-07-10 19:50:38 +00:00
