Commit graph

4572 commits

Author SHA1 Message Date
https://launchpad.net/~stephane-gourichon-lpad
12badacf5b Added a comment 2017-07-20 16:33:03 +00:00
https://launchpad.net/~stephane-gourichon-lpad
1fb85a48f8 Added a comment: How about find .git/annex/transfer .git/annex/bad -type f -print0 | xargs -0 rm -fv 2017-07-19 19:42:25 +00:00
supernaught
193005b583 Added a comment 2017-07-18 17:03:54 +00:00
https://launchpad.net/~stephane-gourichon-lpad
fc77786074 2017-07-18 10:30:54 +00:00
https://launchpad.net/~liori
7b36908733 Added a comment 2017-07-16 13:08:41 +00:00
https://launchpad.net/~liori
763beec4f8 2017-07-15 13:55:39 +00:00
chocolate.camera@ec2ecab153906be21ac5f36652c33786ad0e0b60
987f372f8a How to use git-annex for content on external drives only? 2017-07-10 10:17:34 +00:00
memeplex
99a71b6c32 Added a comment 2017-07-08 15:47:47 +00:00
memeplex
651829ab4c Added a comment 2017-07-08 15:37:13 +00:00
alex@20f891a76542a3d12976c3bfef5d4b5b47070a6a
67f482e481 2017-06-29 07:04:58 +00:00
https://launchpad.net/~felixonmars
7978f1f8b9 Added a comment 2017-06-28 17:45:49 +00:00
https://launchpad.net/~felixonmars
28a08fcbd4 2017-06-28 16:52:00 +00:00
https://launchpad.net/~felixonmars
da05f836b6 Added a comment 2017-06-27 15:57:40 +00:00
https://launchpad.net/~barthelemy
2f4e67e9f6 2017-06-27 00:06:11 +00:00
Joey Hess
e8464f106b
followup 2017-06-26 13:13:49 -04:00
Joey Hess
58a7316a0e
response 2017-06-26 12:57:01 -04:00
Joey Hess
c0bedbaed9
followup 2017-06-26 12:49:20 -04:00
Joey Hess
a3aaf6ff28
followup 2017-06-26 12:16:38 -04:00
https://launchpad.net/~felixonmars
70abadf906 2017-06-19 19:15:44 +00:00
unqueued
63c60c9897 removed 2017-06-19 01:20:40 +00:00
unqueued
94dae0ff7c Added a comment 2017-06-18 14:45:13 +00:00
avar
27f7c8d09a Added a comment 2017-06-16 20:37:48 +00:00
memeplex
63317c321c 2017-06-16 13:23:51 +00:00
Joey Hess
1426f7ff3a
disable closingTracked on OSX
Don't trust OSX FSEvents's eventFlagItemModified to be called when the last
writer of a file closes it; apparently that sometimes does not happen,
which prevented files from being quickly added.

This commit was sponsored by John Peloquin on Patreon.
2017-06-09 14:18:58 -04:00
Joey Hess
a20d8ed4cc
comment 2017-06-09 13:50:59 -04:00
jeff
855f35d00d Added a comment 2017-06-07 21:24:36 +00:00
Joey Hess
f62e6b358d
followup 2017-06-07 12:31:33 -04:00
Joey Hess
bb5f22d815
response 2017-06-06 15:49:40 -04:00
Joey Hess
5687cc55f9
response 2017-06-06 14:46:56 -04:00
Joey Hess
e0d90448b1
response 2017-06-06 13:43:09 -04:00
Joey Hess
f04353e066
response 2017-06-06 13:00:54 -04:00
Joey Hess
4f0715344e
response 2017-06-06 11:34:59 -04:00
openmedi
462459f41f 2017-06-05 17:09:38 +00:00
Joey Hess
ca0736cc91
comment 2017-06-01 13:20:13 -04:00
Joey Hess
6ae27843b6
Merge branch 'master' of ssh://git-annex.branchable.com 2017-06-01 12:59:05 -04:00
Joey Hess
94351daba6
configuration to disable automatic merge conflict resolution
* Added annex.resolvemerge configuration, which can be set to false to
  disable the usual automatic merge conflict resolution done by git-annex
  sync and the assistant.
* sync: Added --no-resolvemerge option.

Note that disabling merge conflict resolution is probably not a good idea
in a direct mode repo or adjusted branch. Since updates to both are done
outside the usual work tree, if it fails the tree is not left in a
conflicted state, and it would be hard to manually resolve the conflict.
Still, made annex.resolvemerge be supported in those cases for consistency.

This commit was sponsored by Riku Voipio.
2017-06-01 12:51:01 -04:00
pgunn01@39c747700d10e9e9e4557a407cba2f88c22b202d
9a48f07469 Added a comment: reply to joey 2017-06-01 16:47:25 +00:00
Joey Hess
650b3fd4c7
comment 2017-06-01 11:48:45 -04:00
pgunn01@39c747700d10e9e9e4557a407cba2f88c22b202d
1dd2e72211 2017-05-30 22:21:47 +00:00
Horus
df880fe815 Added a comment 2017-05-29 18:10:55 +00:00
mario
69054c6bd4 Added a comment: Working again 2017-05-29 15:19:18 +00:00
jeff
f55a04af4f 2017-05-26 20:29:12 +00:00
mario
e36e58cd68 Added a comment 2017-05-25 18:26:00 +00:00
Joey Hess
78b9e9c67f
response 2017-05-25 13:53:22 -04:00
Joey Hess
b6f99891de
comment 2017-05-25 13:50:34 -04:00
Joey Hess
f623623343
comment 2017-05-25 13:46:48 -04:00
mario
c87f4f8c1b Added a comment 2017-05-25 12:47:18 +00:00
mario
bd2035b96e Added a comment 2017-05-25 12:01:46 +00:00
Joey Hess
dd65ea52c3
comment 2017-05-24 13:45:14 -04:00
Joey Hess
ec8515d37c
response 2017-05-24 13:38:17 -04:00