mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
17943 commits 13 branches 445 tags 112 MiB
Commit graph

4196 commits

Author SHA1 Message Date
Joey Hess
f2ec50ae0f dup 2014-03-05 13:10:37 -04:00
Joey Hess
f6df004daa moreinfo 2014-03-05 13:05:49 -04:00
Joey Hess
3fb291f482 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 23:24:16 -04:00
Joey Hess
1f98d6fb00 glacier: Pass --region to glacier checkpresent. 
I suppose this is not necessary when it has a local cache, so I didn't
notice it was missing.
 2014-03-04 23:22:24 -04:00
http://joeyh.name/
5dcc8555d2 Added a comment 2014-03-05 03:15:44 +00:00
http://joeyh.name/
43ae02e572 Added a comment 2014-03-05 03:14:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA
1aaa7a44cc 2014-03-05 01:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
38a216abb2 Added a comment 2014-03-04 11:01:13 +00:00
Joey Hess
1fbf5f608d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 02:11:20 -04:00
Joey Hess
4a847cdc08 finish fixing direct mode merge bug involving unstaged local files 
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.

Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.

Still need to run test suite on windows.
 2014-03-04 02:03:15 -04:00
http://joeyh.name/
d6c69b8d66 Added a comment 2014-03-03 21:58:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
bf981aa1d0 2014-03-03 20:34:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
28c97d3104 2014-03-03 20:27:58 +00:00
Joey Hess
eef1b7a3cc fixed initial reported problem but not out of the woods yet in some related cases 2014-03-03 15:00:54 -04:00
http://joeyh.name/
c8e4c76302 2014-03-03 18:12:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
502743b801 Added a comment 2014-03-03 14:05:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
db47b041f1 Added a comment 2014-03-03 14:01:11 +00:00
https://id.koumbit.net/anarcat
b7b1d2d3ff Added a comment 2014-03-02 16:33:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY
53a431ea3a Added a comment: XMPP something to do with it? 2014-03-02 13:48:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
5378e8fcda Added a comment 2014-03-01 11:23:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e4723688e2 2014-03-01 10:39:11 +00:00
Joey Hess
d41367cc08 remove buggy --listen=host:port support 2014-02-28 22:53:26 -04:00
Joey Hess
7ac37a7854 Probe for quvi version at run time. 
Overhead: git annex addurl runs quvi --version once.
And more bloat to Annex state..
 2014-02-28 14:54:02 -04:00
EskildHustvedt
9ec1441a94 Added a comment 2014-02-28 17:56:42 +00:00
http://joeyh.name/
0a7d6df610 Added a comment 2014-02-28 17:52:07 +00:00
EskildHustvedt
d769d961eb 2014-02-28 08:50:56 +00:00
Hanno
e92b6050b3 Added a comment 2014-02-27 16:10:54 +00:00
Joey Hess
0824fbccbb Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-27 11:36:01 -04:00
Joey Hess
d856ae72a0 close 2014-02-27 11:35:57 -04:00
http://joeyh.name/
d872677e35 Added a comment 2014-02-27 15:35:29 +00:00
EskildHustvedt
205e2870cf Added a comment 2014-02-27 14:16:12 +00:00
philm
e296ef0087 2014-02-27 11:43:35 +00:00
http://joeyh.name/
2b39789e8b Added a comment 2014-02-26 18:52:18 +00:00
http://joeyh.name/
be6508aadd Added a comment 2014-02-26 18:34:18 +00:00
http://joeyh.name/
c26cb9fd9a Added a comment 2014-02-26 17:38:05 +00:00
fmarier
023ab19e5d Added a comment: Re: No working ubuntu package 2014-02-26 02:06:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlm_3m5gLhML9bHbZ8FpJ-HBZhWaRfFeO8
46b028d3cd Added a comment: I got this error too. 2014-02-25 17:23:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
d201d7378c Added a comment: any ideas or questions? 2014-02-25 13:41:16 +00:00
EskildHustvedt
ccc1b6c04b 2014-02-25 00:09:47 +00:00
http://joeyh.name/
7790f7aa39 Added a comment 2014-02-24 23:39:47 +00:00
Joey Hess
50ded61c26 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-24 18:22:22 -04:00
Joey Hess
d5a2b498f6 webdav: When built with DAV 0.6.0, use the new DAV monad to avoid locking files, which is not needed by git-annex's use of webdav, and does not work on Box.com. 2014-02-24 18:21:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI
2d9787a991 Added a comment: sounds good 2014-02-24 19:39:12 +00:00
http://joeyh.name/
df43ce926b Added a comment 2014-02-24 18:32:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI
d9b079ff4b 2014-02-24 17:54:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
5ad9a7c902 Added a comment 2014-02-24 13:20:28 +00:00
stp
e0c1cbdab7 Added a comment: Ídea 2014-02-23 14:25:23 +00:00
Joey Hess
39d7579f04 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-21 18:34:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
9babfe70b7 Added a comment 2014-02-21 22:05:06 +00:00
Joey Hess
e834227202
move bug from forum and close 2014-02-21 13:43:20 -04:00