diff --git a/doc/todo/annex_merge_--remotes/comment_3_35614da544e315529b236a36e1b28e2d._comment b/doc/todo/annex_merge_--remotes/comment_3_35614da544e315529b236a36e1b28e2d._comment new file mode 100644 index 0000000000..be9e733035 --- /dev/null +++ b/doc/todo/annex_merge_--remotes/comment_3_35614da544e315529b236a36e1b28e2d._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2018-08-06T15:47:56Z" + content=""" +This came up again in +and there it was sufficient to configure remote.name.fetch so that no +branches were fetched from the cache remote. + +Approach #3 can be implemented using: + + fetch = refs/heads/master:refs/remotes/private/nomerge/master + +This prevents git-fetch from fetching the git-annex branch, and +it makes the remote master banch fetch into a name that +git-annex won't automatically merge into master. +"""]]