Commentary: explain why pseudomerges are the way round they are

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index ad501d8a9f3f2d59678af0cd567b162380ce14a7..f6d379ac81b036e4be6682e1a25b9c24a9b867ef 100755 (executable)
--- 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]",