merge step modifies HEAD if noop

max630 / git-rehi

git-rehi, history editor

https://github.com/max630/git-rehi/wiki

GNU General Public License v2.0

3 stars 0 forks source link

merge step modifies HEAD if noop #11

Closed max630 closed 11 years ago

max630 commented 11 years ago

When merging already merged commit (can happen when destination != from), the merge is effectively a no-op, and specified merge comment is assigned to preceding commit, modifying it

This should not happen. I think it would be appropriate to report error in such case, because quite probably user will want to use some other parent.

max630 commented 11 years ago

this is really annoying and hits unexpectedly. Needs to be fixed

max630 commented 11 years ago

fixed