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
Joey Hess
92dca9f067
comment
2017-05-24 13:23:27 -04:00
Joey Hess
04baf38e9f
comment
2017-05-24 13:10:50 -04:00
Joey Hess
620e706e2a
response
2017-05-24 13:08:16 -04:00
mario
f96cf53e29
2017-05-22 17:30:30 +00:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
b6f9ba2886
Added a comment
2017-05-22 14:40:21 +00:00
dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee5641
ebc1e9a603
Added a comment: (compress/tar)ing the files
2017-05-19 12:14:14 +00:00
mario
80d5a02ed0
Added a comment
2017-05-19 12:00:03 +00:00
leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf7682
7a98f840e1
Added a comment
2017-05-19 01:02:57 +00:00
mario
dd9fef3087
2017-05-18 16:36:54 +00:00
dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee5641
9fdf33d0c8
item in history -> single item
2017-05-18 13:57:09 +00:00
mario
0bbe08960b
2017-05-18 13:21:27 +00:00
dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee5641
4c634e3c0b
update links
2017-05-18 11:44:54 +00:00
dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee5641
8910c02983
2017-05-18 11:41:53 +00:00
mario
91a6920344
Added a comment: p.s.
2017-05-17 14:34:40 +00:00
mario
1f8299f5cc
Added a comment: Hanging problem still there
2017-05-17 14:05:41 +00:00
https://launchpad.net/~stephane-gourichon-lpad
ccabf1ed53
Describe issue, actions done, question.
2017-05-14 11:16:44 +00:00
olaf
d1006a59b5
Added a comment
2017-05-11 23:45:36 +00:00
leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf7682
65d6adbbe7
Added a comment
2017-05-11 23:23:45 +00:00
Joey Hess
a7ea8b3a17
followup
2017-05-11 13:23:44 -04:00
Joey Hess
245f4251ef
response
2017-05-11 13:20:23 -04:00
Joey Hess
b9ffa8e1c7
response
2017-05-11 13:12:51 -04:00
