merge: Avoid creating the synced/master branch.
The branch needs to be created when merging from the remote in sync, since we diff between it and the remote's sync branch. But git annex merge should not be creating sync branches.
This commit is contained in:
parent
76bc0ce2a2
commit
60fc25e9d3
3 changed files with 17 additions and 5 deletions
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 5"""
|
||||
date="2015-07-07T19:20:17Z"
|
||||
content="""
|
||||
So, I was wrong about `git annex merge` creating the synced/master branch.
|
||||
|
||||
There's no good reason for it to do that, so I've fixed it not to create
|
||||
it.
|
||||
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue