Commit graph

16925 commits

Author SHA1 Message Date
http://joeyh.name/
6ab23cd8e7 Added a comment 2014-01-02 02:16:10 +00:00
Joey Hess
f83e5c75dc Assistant: Remove stale MERGE_HEAD files in lockfile cleanup.
See http://git-annex.branchable.com/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/
2014-01-01 22:05:33 -04:00
http://joeyh.name/
9cd8282047 Added a comment 2014-01-02 02:05:06 +00:00
Joey Hess
858eb26303 Avoid looping if long-running git cat-file or git hash-object crashes and keeps crashing when restarted. 2014-01-01 21:42:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e3344c1c71 Added a comment 2014-01-02 01:32:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c65b7eda85 Added a comment 2014-01-02 01:31:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c37ac517ac Added a comment 2014-01-02 01:15:40 +00:00
Richard Hartmann
bf8dbdebfb Merge branch 'master' of git://git-annex.branchable.com 2014-01-02 02:11:48 +01:00
Richard Hartmann
00c1be812e Add doc/todo/wishlist:_git_annex_info_UUID.mdwn 2014-01-02 02:11:23 +01:00
http://joeyh.name/
4189d4ca5f Added a comment 2014-01-02 01:11:15 +00:00
Richard Hartmann
23fff40959 Merge branch 'master' of git://git-annex.branchable.com 2014-01-02 02:02:53 +01:00
Richard Hartmann
7fc11913f2 Add endless_loop_when_PWD_gone.mdwn 2014-01-02 02:02:38 +01:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
f8545ce6f4 Added a comment: Thanks 2014-01-02 00:41:28 +00:00
Joey Hess
020230e46d Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-01 20:37:06 -04:00
Joey Hess
27fccbd350 devblog 2014-01-01 20:34:17 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
344110d443 Added a comment 2014-01-02 00:26:20 +00:00
http://joeyh.name/
15a4588116 Added a comment 2014-01-02 00:15:28 +00:00
Joey Hess
0b1ddb69e5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-01 20:12:41 -04:00
Joey Hess
8e3032df2d added GETWANTED, SETWANTED for Tobias's flickr remote
This was unexpectedly difficult because of a depdenency cycle. To parse a
preferred content expression involves several things that need to operate
on the list of remotes. Which needs Remote.External. The only way to avoid
this cycle (I tried breaking it at several points) was to skip parsing the
expression in SETWANTED.

That's sorta ok, because git-annex already has to deal with unparsable
preferred content expressions being stored, in order to handle eg,
upgrades. But I'm still not very happy that I cannot check it.

I feel this is a strong indication that I need to beware of further
bloating the special remote protocol interface.
2014-01-01 20:12:20 -04:00
Joey Hess
f0a6de1ca2 add PreferredContentExpression type 2014-01-01 19:58:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
3a3d503853 Added a comment 2014-01-01 23:52:32 +00:00
http://joeyh.name/
bf17c8e5b3 Added a comment 2014-01-01 22:30:07 +00:00
Richard Hartmann
38239750e9 Add doc/todo/commit_in_direct_mode.mdwn 2014-01-01 22:55:27 +01:00
Richard Hartmann
8af5df7e5b Merge branch 'master' of git://git-annex.branchable.com 2014-01-01 22:48:45 +01:00
Richard Hartmann
5e0dad0972 Update comment 2014-01-01 22:48:32 +01:00
Joey Hess
255637ffa2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-01 17:40:10 -04:00
Joey Hess
079f463d51 mirror: Support --all (and --unused). 2014-01-01 17:39:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
5977ec78d3 Added a comment 2014-01-01 21:32:56 +00:00
http://joeyh.name/
1c98afccc5 Added a comment 2014-01-01 21:05:20 +00:00
http://joeyh.name/
f856a5fb03 Added a comment 2014-01-01 21:03:31 +00:00
http://joeyh.name/
a4251bdbf1 Added a comment 2014-01-01 20:59:32 +00:00
http://joeyh.name/
f0a26b2b9f Added a comment 2014-01-01 20:46:18 +00:00
http://joeyh.name/
da863e4549 Added a comment 2014-01-01 20:45:19 +00:00
http://joeyh.name/
adb6970c37 removed 2014-01-01 20:43:52 +00:00
http://joeyh.name/
f0493592a9 Added a comment 2014-01-01 20:43:06 +00:00
http://joeyh.name/
703e291091 Added a comment 2014-01-01 20:42:42 +00:00
Joey Hess
ba20e5a7f4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-01 16:37:16 -04:00
http://joeyh.name/
08076ce412 Added a comment 2014-01-01 20:31:34 +00:00
https://id.koumbit.net/anarcat
8598ac1fd7 Added a comment 2014-01-01 20:30:18 +00:00
Joey Hess
d544d0e086 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-01 16:27:50 -04:00
Joey Hess
1118247394 OSX: Avoid using external hash programs, since SIGILL is not fun 2014-01-01 16:26:43 -04:00
http://joeyh.name/
de648f5ce9 Added a comment 2014-01-01 20:13:04 +00:00
http://joeyh.name/
be3ff0f834 Added a comment 2014-01-01 19:59:12 +00:00
http://joeyh.name/
48f06f2781 Added a comment 2014-01-01 19:56:32 +00:00
Joey Hess
2f7795e9cd retitle for remaining problem 2014-01-01 15:53:02 -04:00
Joey Hess
84e9f764f1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-01-01 15:52:25 -04:00
Joey Hess
fab7adb161 Windows: Avoid eating stdin when running ssh to add a authorized key, since this is used for password prompting. 2014-01-01 15:49:51 -04:00
Joey Hess
2c27b1397b windows: add more libraries, these are used by gpg 2014-01-01 15:30:58 -04:00
https://id.koumbit.net/anarcat
e03d9b1e01 2014-01-01 19:12:21 +00:00
https://id.koumbit.net/anarcat
a0a1a2f37a 2014-01-01 19:00:55 +00:00