Am 10.02.2015 um 12:46 schrieb Sergey Organov: > Johannes Sixt <j...@kdbg.org> writes: > >> Am 09.02.2015 um 13:53 schrieb Sergey Organov: > > [...] > >> If you want a version of --preserve-merges that does what *you* need, >> consider this commit: >> >> git://repo.or.cz/git/mingw/j6t.git rebase-p-first-parent >> >> Use it like this: >> >> git rebase -i -p --first-parent ... > > Thanks a lot, this sounds promising! I've read the message for this > commit and it mentions no drawbacks. Are you aware of any?
Except for this... >> Beware, its implementation is incomplete: if the rebase is interrupted, >> then 'git rebase --continue' behaves as if --first-parent were not >> given. ... not anything that I would care about. Of course, you can't rebase branchy history when this option is specified, but that's the whole point. > Just never did get round to it, or something more fundamental? Nothing fundamental. Just has to store the option in the rebase state like all the other options. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
