X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=f6d379ac81b036e4be6682e1a25b9c24a9b867ef;hp=ad501d8a9f3f2d59678af0cd567b162380ce14a7;hb=236890b58b8255d8d540b5cbd326228489bd0363;hpb=bc95a2402f9e765113ef38d12d642a3340132049 diff --git a/git-debrebase b/git-debrebase index ad501d8a..f6d379ac 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1086,6 +1086,8 @@ sub stitch ($$$$$) { } } fresh_workarea(); + # We make pseudomerges with L as the contributing parent. + # This makes git rev-list --first-parent work properly. my $new_head = make_commit [ $old_head, $ffq_prev ], [ 'Declare fast forward / record previous work', "[git-debrebase pseudomerge: $prose]",