Commit graph

19873 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
5ec8bcfaa7 Added a comment 2014-06-10 02:18:43 +00:00
Joey Hess
f08fcb5030 simplify 2014-06-09 20:32:11 -04:00
Joey Hess
03f186609f devblog 2014-06-09 20:16:01 -04:00
Joey Hess
ab72456bb3 avoid fast-forwarding when a merge conflict was auto-resolved 2014-06-09 20:10:12 -04:00
Joey Hess
2dfbbc6b43 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 19:47:31 -04:00
Joey Hess
d6711800ad avoid bad commits after interrupted direct mode sync (or merge)
It was possible for a interrupted sync or merge in direct mode to
leave the work tree out of sync with the last recorded commit.
This would result in the next commit seeing files missing from the work
tree, and committing their removal.

Now, a direct mode merge happens not only in a throwaway work tree, but using
a temporary index file, and without any commits or index changes
being made until the real work tree has been updated. If the merge is
interrupted, the work tree may have some updated files, but worst case a
commit will redundantly commit changes that come from the merge.

This commit was sponsored by Tony Cantor.
2014-06-09 19:40:28 -04:00
https://id.koumbit.net/anarcat
2c6929dd27 try to build an hybrid news feed 2014-06-09 23:24:20 +00:00
Joey Hess
193e702d73 harder 2014-06-09 17:43:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
b36bad94a1 Added a comment 2014-06-09 21:16:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
fe4eb0517d Added a comment 2014-06-09 20:34:55 +00:00
http://joeyh.name/
5f7d5c7d67 Added a comment 2014-06-09 19:44:49 +00:00
Joey Hess
920794ab6b bug 2014-06-09 15:43:52 -04:00
Joey Hess
70a00802a6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 15:32:24 -04:00
http://joeyh.name/
49cc5e1594 Added a comment 2014-06-09 19:29:09 +00:00
Joey Hess
7671d228af Avoid leaving behind .tmp files when failing in some cases, including importing files to a disk that is full. 2014-06-09 15:24:05 -04:00
Joey Hess
24915adab7 tagging 2014-06-09 15:09:03 -04:00
http://joeyh.name/
f50e8acb99 Added a comment 2014-06-09 18:57:25 +00:00
http://joeyh.name/
7dd162ba1f Added a comment 2014-06-09 18:46:01 +00:00
Joey Hess
787d9e27ba Ignore setsid failures. 2014-06-09 14:44:18 -04:00
Joey Hess
b6274745b4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-09 14:43:49 -04:00
Joey Hess
a59ac68c22 qualify comment 2014-06-09 13:48:44 -04:00
Joey Hess
1d4ba328e5 close; forwarded 2014-06-09 13:40:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
00b02383e2 Added a comment: build failure 2014-06-09 15:13:18 +00:00
Tamschi
fee77cc910 Added a comment: It's still impossible to use the git-annex repository on Windows. 2014-06-09 14:44:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
4b270fda85 Describe bug. 2014-06-08 12:54:27 +00:00
feulif
a1690ec3d6 Added a comment: Thank you 2014-06-08 08:36:40 +00:00
martin
f476e96e43 Added a comment: use case and answer to joey's question "...then when..." 2014-06-08 04:59:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
e4df4f6114 Added a comment: possible to have a view based on file location info? 2014-06-08 03:55:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
28cdd251a5 Added a comment: Android 2014-06-08 02:44:45 +00:00
Richard Hartmann
8c1a1ab416 Typo 2014-06-07 14:57:35 +02:00
EskildHustvedt
15f043b20c Added a comment 2014-06-07 05:47:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
f490015d6c Added a comment: a different fix 2014-06-07 04:27:49 +00:00
http://sunny256.sunbase.org/
a48b9af487 Suggest --byte-limit option 2014-06-07 02:56:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
9600e79f76 2014-06-06 22:42:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8BAEUyzYhORZmMuocRTk4M-3IumDm5VU
b19fc9dc10 Added a comment: Windows Support +1 2014-06-06 21:54:38 +00:00
http://joeyh.name/
a62f772948 Added a comment 2014-06-06 18:18:36 +00:00
Joey Hess
2f84659d51 fix build with old versions of bytestring 2014-06-06 14:04:35 -04:00
Joey Hess
c03f192a4b add news item for git-annex 5.20140606 2014-06-06 13:41:46 -04:00
Joey Hess
783975bb8d prep release 2014-06-06 13:06:13 -04:00
http://joeyh.name/
602499771b Added a comment 2014-06-06 16:53:21 +00:00
EskildHustvedt
48793b6cec Added a comment 2014-06-06 16:13:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
b8717938d1 2014-06-06 11:02:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
df06773d1d Added a comment 2014-06-06 10:49:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmYMS6tQ8q9k1fylGyA9Q6fdFzRBotME2Q
76f58ae07d Added a comment 2014-06-06 09:57:32 +00:00
Joey Hess
c2add53756
devblog 2014-06-05 17:33:28 -04:00
Joey Hess
ded79929bc Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-05 15:55:01 -04:00
Joey Hess
dcddacfd5c fixed getting files from bare repos on windows 2014-06-05 15:54:06 -04:00
martin
5d8f87e530 Added a comment: another scenario 2014-06-05 19:52:05 +00:00
Joey Hess
8f717643a6 put old manual instructions in
I use them on the autobuilder, for example.
2014-06-05 15:40:54 -04:00
Joey Hess
40dc635995 move page 2014-06-05 15:36:49 -04:00