mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17997 commits 13 branches 442 tags 103 MiB
Commit graph

12793 commits

Author SHA1 Message Date
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
Joey Hess
4643a0120c doc improvements 2014-03-02 15:46:58 -04:00
Joey Hess
7d9486a709 vadd: Allow listing multiple desired values for a field. 2014-03-02 15:36:45 -04:00
Joey Hess
c2e8c21ca6 view, vfilter: Add support for filtering tags and values out of a view, using !tag and field!=value. 
Note that negated globs are not supported. Would have complicated the code
to add them, without changing the data type serialization in a
non-backwards-compatable way.

This commit was sponsored by Denver Gingerich.
 2014-03-02 14:53:19 -04: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=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
233df8dc4a Added a comment: Didn't work 2014-03-01 22:40:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
e5fde8d47a Added a comment 2014-03-01 19:13:18 +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
gueux
238f1995c8 2014-03-01 10:06:16 +00:00
Joey Hess
2432ecbdcc simplify 2014-03-01 00:41:29 -04:00
Joey Hess
6a355686ff annex.listen can be configured, instead of using --listen 2014-03-01 00:31:17 -04:00
Joey Hess
4e62cf60e4 devblog 2014-02-28 22:53:47 -04:00
Joey Hess
d41367cc08 remove buggy --listen=host:port support 2014-02-28 22:53:26 -04:00
Joey Hess
0bc8dabb54 docs for remote webapp, securely 2014-02-28 22:39:06 -04:00
Joey Hess
cdc5b4a385 depend on warp-tls.. at least for now 2014-02-28 21:37:33 -04:00
Joey Hess
fb2a38963f
show how to set up preferred content for IA like the webapp does 2014-02-28 18:42:31 -04:00
Joey Hess
1a253157f4 remove note about fedora being out of date 
It's pretty current.
 2014-02-28 16:03:12 -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
rupi
c32b027a2b Added a comment: xdg-open 2014-02-28 17:48:23 +00:00
EskildHustvedt
d769d961eb 2014-02-28 08:50:56 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
80e16b4fdf 2014-02-28 05:46:38 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
b12cb0f471 2014-02-28 05:37:22 +00:00
Joey Hess
9ec8a89029
devblog 2014-02-27 17:43:59 -04:00
Joey Hess
1ba60ac3e9 update 2014-02-27 17:29:03 -04:00
Joey Hess
15f0afd874 update 2014-02-27 13:37:57 -04:00
Hanno
e92b6050b3 Added a comment 2014-02-27 16:10:54 +00:00
Joey Hess
647d0d397f add news item for git-annex 5.20140227 2014-02-27 11:55:31 -04: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
Joey Hess
07ec352f9c much less hacky windows XMPP library deps install method 2014-02-27 11:34:06 -04:00
EskildHustvedt
205e2870cf Added a comment 2014-02-27 14:16:12 +00:00
philm
e296ef0087 2014-02-27 11:43:35 +00:00
Joey Hess
ce82fe1915 another pkg-config 2014-02-26 21:11:40 -04:00
Joey Hess
552c77e6b8
devblog 2014-02-26 21:11:08 -04:00
Joey Hess
f95b4f6d88 progress on XMPP for windows, but not linking yet 2014-02-26 21:10:32 -04:00
Joey Hess
6c105ab6c3 tiny process on XMPP 2014-02-26 18:31:18 -04:00
Joey Hess
7bac637edf move comment to better place 2014-02-26 17:08:35 -04:00
Joey Hess
23755e5a1e Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-26 17:08:10 -04:00
http://joeyh.name/
de963bf1ac Added a comment 2014-02-26 21:07:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
b23bd59962 Added a comment: Are the ARM binaries ARMv6 or ARMv7? 2014-02-26 21:04:44 +00:00
Joey Hess
b01628f1d1 document more .git/annex/ contents 2014-02-26 17:04:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk2BFMjJW081uX4aJdhStmSFPBUGzL92ZU
258978ffb8 Added a comment: where do I put the SSH keys on Android 2014-02-26 20:26:49 +00:00
http://joeyh.name/
add376e4d2 Added a comment 2014-02-26 19:40:18 +00:00
http://joeyh.name/
2b39789e8b Added a comment 2014-02-26 18:52:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7hS2LGu4sLUxLMdBA16PAMcVO7CDJmjw
65fba6b7ed 2014-02-26 18:45:15 +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
https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg
3d2512df92 Added a comment: Metadata for the win! 2014-02-26 07:03:34 +00:00
fmarier
023ab19e5d Added a comment: Re: No working ubuntu package 2014-02-26 02:06:26 +00:00
Joey Hess
06e9080f01 metadata: FIeld names are now case insensative. 2014-02-25 18:45:09 -04:00
Richard Hartmann
502bfe9229 Typo 2014-02-25 22:56:45 +01:00
Richard Hartmann
71426bf41c Merge branch 'master' of git://git-annex.branchable.com 2014-02-25 22:38:01 +01:00
Joey Hess
923aa48bf4
devblog 2014-02-25 17:26:13 -04:00
Joey Hess
aa39457f5f update 2014-02-25 17:26:04 -04:00
Joey Hess
2dc336b1b8 remove todo item about gcywin git, seems no longer a problem! 2014-02-25 17:12:21 -04:00
Joey Hess
5bd258754a Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-25 16:42:38 -04:00
Joey Hess
326aa6c604
webdav and S3 tested and working on windows, for real now 2014-02-25 16:41:44 -04:00
Joey Hess
2b66aaa763 Windows webdav: Fix DOS path separator bug. 
Use posix </> etc for urls.
 2014-02-25 15:26:33 -04: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=AItOawmmA6YpvP2dFDs5rMlhBWEWWgo2IZjOQGo
827d6916ba 2014-02-25 13:53:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmA6YpvP2dFDs5rMlhBWEWWgo2IZjOQGo
7af533db34 2014-02-25 13:53:16 +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
https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w
cb91f3c86a Added a comment: Customise conflict resolution behaviour 2014-02-25 11:42:08 +00:00
Richard Hartmann
77648cead5 Merge branch 'master' of git://git-annex.branchable.com 2014-02-25 12:38:25 +01:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
2e37ebbfc0 Added a comment: the startup check is not a small issue 2014-02-25 11:37:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
e52f64f202 Added a comment 2014-02-25 09:57:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
5ebabc0841 Added a comment 2014-02-25 09:51:17 +00:00