1 Ideas for a major revamp of the ''--preserve-merges'' handling in ''git rebase''
3 As probably everybody agrees, the code to preserve merges is a big mess
6 Worse, the whole concept of "pick <merge-sha1>" just does not fly well.
8 So I started a _major_ cleanup, which happens to reduce the code very
11 It will take a few days to flesh out, I guess, but these are the major
15 <blockquote>will only work on non-merges in the future.</blockquote>
16 <b>merge $sha1 [$sha1...] was $sha1 Merge ...</b><br>
17 <blockquote>will merge the given list of commits into the current HEAD, for
18 the user's reference and to keep up-to-date what was rewritten,
19 the original merge is shown after the keyword "was" (which is not
20 a valid SHA-1, luckily).</blockquote>
22 <blockquote>will reset the HEAD to the given commit.</blockquote>
24 <blockquote>for merge and goto, if a $sha1 ends in a single quote, the
25 rewritten commit is substituted (if there is one).</blockquote>
35 could yield this TODO script:
46 This should lead to a much more intuitive user experience.
48 I am very sorry if somebody actually scripted ''rebase -i -p'' (by setting
49 GIT_EDITOR with a script), but I am very certain that this cleanup is
50 absolutely necessary to make ''rebase -i -p'' useful.