merge: Improve commit messages to mention what was merged.

This commit is contained in:
Joey Hess 2011-11-12 14:51:19 -04:00
parent fe4ad93e4a
commit 897bf938f6
2 changed files with 15 additions and 6 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (3.20111112) UNRELEASED; urgency=low
* merge: Improve commit messages to mention what was merged.
-- Joey Hess <joeyh@debian.org> Sat, 12 Nov 2011 14:50:21 -0400
git-annex (3.20111111) unstable; urgency=low
* Handle a case where an annexed file is moved into a gitignored directory,