diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-09 21:12:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-09 21:13:28 -0400 |
| commit | fc64015a7af4bbc531a1e4bc8741d86609b1f0bf (patch) | |
| tree | 37a136342381279aefeb96a26b9bd8bc7f806954 /debian | |
| parent | af27920956c9ef59052662389bff1ba40efd1ea0 (diff) | |
fix union merge to call diff-index with -- after the ref
Otherwise, if there's a file in the repo with a name matching the ref,
git could get confused and the merge not work.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index cc7e1fa20..f4afbc461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ git-annex (5.20150410) UNRELEASED; urgency=medium - * Fix activity log parsing. + * Fix activity log parsing, which caused the log to not retain + activity from other uuids. + * Union merge could fall over if there was a file in the repository + with the same name as a git ref. Now fixed. -- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400 |