summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-05-31 20:43:35 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-11 08:44:13 -0700
commitcddb42d2c58a9de9b2b5ef68817778e7afaace3e (patch)
treea84c9d248cc0af010f499a815a6d9a38997d0e85 /xdiff/xmerge.c
parentChange C99 comments to old-style C comments (diff)
downloadtgif-cddb42d2c58a9de9b2b5ef68817778e7afaace3e.tar.xz
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>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions