diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-08 23:31:02 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 22:40:14 +0100 |
| commit | 236890b58b8255d8d540b5cbd326228489bd0363 (patch) | |
| tree | 77dab2e46c8d687c525bd45279ff4110dd9e4b65 /git-debrebase | |
| parent | bc95a2402f9e765113ef38d12d642a3340132049 (diff) | |
Commentary: explain why pseudomerges are the way round they are
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index ad501d8..f6d379a 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]", |