sync, merge: Bug fix: Don't try to merge into master when in a bare repo.

This commit is contained in:
Joey Hess 2013-08-17 21:29:44 +02:00
parent 6b4b2a6515
commit a6a047192e
2 changed files with 8 additions and 4 deletions

1
debian/changelog vendored
View file

@ -3,6 +3,7 @@ git-annex (4.20130816) UNRELEASED; urgency=low
* Debian: Run the builtin test suite as an autopkgtest.
* Debian: Recommend ssh-askpass, which ssh will use when the assistant
is run w/o a tty. Closes: #719832
* sync, merge: Bug fix: Don't try to merge into master when in a bare repo.
-- Joey Hess <joeyh@debian.org> Thu, 15 Aug 2013 15:47:52 +0200