Code

rebase -i -p: document shortcomings
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 1 Jun 2010 01:43:35 +0000 (20:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Jun 2010 15:44:13 +0000 (08:44 -0700)
commitcddb42d2c58a9de9b2b5ef68817778e7afaace3e
treea84c9d248cc0af010f499a815a6d9a38997d0e85
parent2543d9b609d158f611e317738644e67cacac6b9a
rebase -i -p: document shortcomings

The rebase --preserve-merges facility presents a list of commits
in its instruction sheet and uses a separate table to keep
track of their parents.  Unfortunately, in practice this means
that with -p after most attempts to rearrange patches, some
commits have the "wrong" parent and the resulting history is
rarely what the caller expected.

Yes, it would be nice to fix that.  But first, add a warning to the
manual to help the uninitiated understand what is going on.

Reported-by: Jiří Paleček <jpalecek@web.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
t/t3404-rebase-interactive.sh