diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index fdd3cb7f6..57be53c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git-annex (3.20111106) UNRELEASED; urgency=low + + * merge: Use fast-forward merges when possible. + Thanks Valentin Haenel for a test case showing how non-fast-forward + merges could result in an ongoing pull/merge/push cycle. + + -- Joey Hess <joeyh@debian.org> Sun, 06 Nov 2011 14:57:57 -0400 + git-annex (3.20111105) unstable; urgency=low * The default backend used when adding files to the annex is changed |