Commit graph

15956 commits

Author SHA1 Message Date
ewen
a89c067025 Added a comment: Linux to OS X ~/.ssh/git-annex-shell 2014-11-15 00:02:02 +00:00
Joey Hess
0c3b51e3aa Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-14 18:19:01 -04:00
Joey Hess
3e96f125db devbog 2014-11-14 18:18:22 -04:00
https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f
c6dcaad4e1 2014-11-14 19:46:54 +00:00
https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f
c406412216 2014-11-14 19:45:57 +00:00
Joey Hess
29573919b4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-14 14:57:07 -04:00
Joey Hess
ffac19a29c Merge branch 'undo' 2014-11-14 14:55:35 -04:00
Joey Hess
2f83914212 Add undo action to nautilus and konqueror integration. 2014-11-14 14:55:21 -04:00
https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f
703f9a3a3d 2014-11-14 18:46:56 +00:00
Joey Hess
13260ccc3a undo command
This commit was sponsored by Andrew Cant.
2014-11-14 14:41:07 -04:00
Joey Hess
31c2ece395 Windows: Remove Alt+A keyboard shortcut, which turns out to have scope outside the menus. 2014-11-14 13:56:05 -04:00
Joey Hess
fe2f543528 Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-14 13:55:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnRFOsnEk8AJg1mXlq3mJDdt1YdYepozE8
bee51c5f51 Added a comment: Other loop strategy? 2014-11-13 21:42:57 +00:00
Joey Hess
d22d650f59 proxy command is closer to plumbing than a general use command 2014-11-13 13:59:00 -04:00
https://www.google.com/accounts/o8/id?id=AItOawktFJRkdqZvsZB59DrY-N1988HkjSIIZ5w
375cd9717e 2014-11-13 10:21:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawktFJRkdqZvsZB59DrY-N1988HkjSIIZ5w
fe13ef3829 2014-11-13 10:21:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawktFJRkdqZvsZB59DrY-N1988HkjSIIZ5w
2a99adf2f1 2014-11-13 10:17:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawktFJRkdqZvsZB59DrY-N1988HkjSIIZ5w
77319a4fc6 2014-11-13 10:17:14 +00:00
Joey Hess
63fa5c0782 Work around apparent bug in lsof 4.88's -F output format. 2014-11-12 18:00:40 -04:00
Joey Hess
03edf308a3 Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-12 17:05:54 -04:00
Joey Hess
2a70d448db devblog 2014-11-12 17:03:24 -04:00
http://joeyh.name/
28324296aa Added a comment 2014-11-12 21:00:41 +00:00
Joey Hess
0052a20333 add toc 2014-11-12 16:08:29 -04:00
Joey Hess
9313abeaf5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-12 15:53:06 -04:00
Joey Hess
864086a956 proxy: for all your direct mode repository munging needs
This allows bypassing the direct mode guard in a safe way to do all sorts
of things including git revert, git mv, git checkout ...

This commit was sponsored by the WikiMedia Foundation.
2014-11-12 15:51:46 -04:00
Joey Hess
3dea8f0533 more design work 2014-11-12 14:07:30 -04:00
Joey Hess
12267089f0 more design work 2014-11-12 13:57:20 -04:00
gernot
27c3c643e0 2014-11-12 16:38:50 +00:00
Joey Hess
708eb514a7 Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-12 11:31:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmXr3WCPwkdtqCNK6GNOAyXwyutqzjobh0
cf8eee906d 2014-11-12 12:00:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnKT33H9qVVGJOybP00Zq2NZmNAyB65mic
917fa638c5 Added a comment 2014-11-12 07:58:08 +00:00
https://id.koumbit.net/lavamind
28a5bd7ca9 2014-11-11 21:57:02 +00:00
Joey Hess
f21e13b393 close 2014-11-11 17:17:27 -04:00
anarcat
47fd7aa688 Added a comment 2014-11-11 21:16:03 +00:00
Joey Hess
eeb54a26b3 devblog 2014-11-11 17:01:16 -04:00
Joey Hess
8bc0d05ebd Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-11 16:19:51 -04:00
Joey Hess
04ca336b8e OSX autobuilder updated to 10.10 2014-11-11 16:18:51 -04:00
https://me.yahoo.com/a/lgHmyxsDhPHsmhHSpL5vMyo8qOUwu4WiaNog#8cc41
63c14e73c5 2014-11-11 10:16:31 +00:00
http://inkwell.za.net/
df234eec07 Added a comment: Confirmation 2014-11-11 08:01:48 +00:00
https://renaud.casenave.fr/
4fe4032144 Added a comment 2014-11-11 04:35:57 +00:00
Joey Hess
55e1f51e47 Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-10 15:37:52 -04:00
Joey Hess
adc5ca70a8 pre-commit: Block partial commit of unlocked annexed file, since that left a typechange staged in index
I had hoped that the git devs could change git's handling of partial
commits to not use a false index file, but seems not.

So, this relies on some git internals to detect that case. The test suite
has a test case added to catch it if changes to git break it.

This commit was sponsored by Paul Tagliamonte.
2014-11-10 15:36:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawknHkJJRE0K7_G4sG3YgOkAaihnw0eg9Ao
8a50782027 Added a comment 2014-11-10 18:06:11 +00:00
Joey Hess
7e558371ab comment 2014-11-10 13:16:07 -04:00
Joey Hess
0af66f47a4 followup 2014-11-10 13:10:37 -04:00
Joey Hess
74584e5b9c works for me 2014-11-10 13:06:20 -04:00
Joey Hess
e4124c566f Merge branch 'master' of ssh://git-annex.branchable.com 2014-11-10 13:05:21 -04:00
https://id.koumbit.net/anarcat
1a185c20b7 2014-11-10 11:42:38 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
b36719f182 Added a comment: is your samba share mounted? 2014-11-10 05:08:39 +00:00
https://id.koumbit.net/anarcat
c54ca6e27e slight annoyance 2014-11-10 04:30:35 +00:00