diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-07 15:45:41 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-07 15:53:27 -0400 |
| commit | deb66de37f3e590ba70c062399c659b366e1d1f6 (patch) | |
| tree | b50cee1e4d6d501c34a58412fbd5c0c8689ed065 /debian/changelog | |
| parent | 6621e07eb527098d9a8bc6dd9a3576a1a27b3563 (diff) | |
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.
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e8264a4a9..45619ea2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |