Commit graph

12764 commits

Author SHA1 Message Date
http://joeyh.name/
aa93a66b4b Added a comment 2014-03-05 20:40:50 +00:00
http://joeyh.name/
acd08c5492 Added a comment 2014-03-05 20:38:05 +00:00
http://joeyh.name/
95ac7a7548 Added a comment 2014-03-05 20:31:58 +00:00
Joey Hess
96fc3c7edf Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-05 15:25:50 -04:00
Joey Hess
b793c77f85 done 2014-03-05 14:37:57 -04:00
http://joeyh.name/
d95c075ae4 Added a comment 2014-03-05 18:02:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
f972f8017f 2014-03-05 17:56:29 +00:00
Joey Hess
c30cc4a119 update with user feedback 2014-03-05 13:52:23 -04:00
Joey Hess
aa377ed567 webdav: When built with a new enough haskell DAV (0.6), disable the http response timeout, which was only 5 seconds. 2014-03-05 13:51:54 -04:00
Joey Hess
ba4df0f112 update roadmap month 2014-03-05 13:27:18 -04:00
http://joeyh.name/
7bdebd3747 Added a comment 2014-03-05 17:11:40 +00:00
Joey Hess
f2ec50ae0f dup 2014-03-05 13:10:37 -04:00
http://joeyh.name/
6fd1a351fd Added a comment 2014-03-05 17:08:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
424b1dcc82 Added a comment 2014-03-05 17:07:05 +00:00
Joey Hess
f6df004daa moreinfo 2014-03-05 13:05:49 -04:00
http://joeyh.name/
8c22a6166e Added a comment 2014-03-05 16:56:14 +00:00
http://joeyh.name/
27ed79f911 Added a comment 2014-03-05 16:53:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
236c3a2075 Added a comment 2014-03-05 16:11:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
69848d7777 Warning messages on Nexus 5 2014-03-05 16:06:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
e8e0b4ee49 Added a comment 2014-03-05 11:47:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e0ce771aa5 Added a comment 2014-03-05 08:10:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
ab253f8339 2014-03-05 06:34:28 +00:00
http://grossmeier.net/
775229a2f4 Added a comment 2014-03-05 04:38:26 +00:00
http://grossmeier.net/
07dcd0eb4b Added a comment 2014-03-05 04:34:54 +00: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
Joey Hess
74f94d21fc
devblog 2014-03-04 20:06:55 -04:00
Joey Hess
33aae51175
idea 2014-03-04 15:19:19 -04: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
Joey Hess
cf8788fb49
add link to darktable-git-annex 2014-03-03 13:33:40 -04: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://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c3be59735d Added a comment 2014-03-03 07:44:30 +00:00
Joey Hess
31062ab2bf
number list 2014-03-02 20:27:37 -04:00
Joey Hess
03dc6dcab8
decruft 2014-03-02 20:26:27 -04:00
Joey Hess
08b9bc7b7b devblog 2014-03-02 20:22:04 -04:00
Joey Hess
d0fce426c4 pre-commit-annex hook script to automatically extract metadata from lots of types of files
Using the extract(1) program to do the heavy lifting.

Decided to make git-annex run pre-commit-annex when committing. Since
git-annex pre-commit also runs it, it'll be run when git commit is run too,
via the pre-commit hook. This basically gives back the pre-commit hook
that git-annex took away. The implementation avoids repeatedly looking
for the hook script when the assistant is running and committing
repeatedly; only checks if the hook is available once.

To make the script simpler, made git-annex metadata -s field?=value
only set a field when it's not already got a value.

This commit was sponsored by bak.
2014-03-02 20:11:58 -04:00
Joey Hess
34059c09e2 update 2014-03-02 16:27:04 -04:00
Joey Hess
06e39e6a79 update 2014-03-02 15:53:31 -04:00
Joey Hess
67c8b312b1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-02 15:47:48 -04:00