Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2015-02-11 16:38:34 -04:00
commit ba0a516242

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
subject="git bug indeed"
date="2015-02-11T18:14:34Z"
content="""
i agree. this does seems like a bug in git. i tried various ways of coercing git into doing what i need, but in the end just ended up adding comments to those commits.
i thought of reporting this to the mailing list, but it turns out there's already patches floating around to fix a bunch of issues with rebase:
<http://search.gmane.org/?query=rebase+empty+commit+message&group=gmane.comp.version-control.git>
in particular:
<http://article.gmane.org/gmane.comp.version-control.git/255411/>
not sure what those will become.
"""]]