search

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

--no-ff option for merges #25

Closed max630 closed 10 years ago

max630 commented 10 years ago

Sometimes it is needed to construct such merges.

Probably it is only for manual construction, because automatic can be applied to a point where it is not desirable anymore. Think about it additionally

max630 commented 10 years ago

There is some solution (see commit cebf1618c6), but:

  1. manual dogfooding fails (though tests pass, investigate why the difference)
  2. such merged not correctly detected. This is definitely a case for some itest
max630 commented 10 years ago

Fixed the issues from previous comment. Looks like it's done