mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

merge: Avoid creating the synced/master branch.

Browse source 
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:
Joey Hess 2015-07-07 15:45:41 -04:00
parent 76bc0ce2a2
commit 60fc25e9d3
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -22,6 +22,7 @@ git-annex (5.20150618) UNRELEASED; urgency=medium
* On linux, pass --as-needed to linker to avoid linking with unused
shared libraries including libyaml.
* import: Fix failure of cross-device import on Windows.
* merge: Avoid creating the synced/master branch.
-- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400