X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=dc423592e2b7b673c802158522416f8c269fc82b;hb=fb99aded391ed1fc792bf3eea3dcae2694060ea5;hp=2a581f389f25cead7ba1b4aa9e8c729b184fc9b4;hpb=bc95a2402f9e765113ef38d12d642a3340132049;p=dgit.git diff --git a/dgit b/dgit index 2a581f38..dc423592 100755 --- a/dgit +++ b/dgit @@ -3888,6 +3888,8 @@ sub pseudomerge_make_commit ($$$$ $$) { : !length $overwrite_version ? " --overwrite" : " --overwrite=".$overwrite_version; + # Contributing parent is the first parent - that makes + # git rev-list --first-parent DTRT. my $pmf = dgit_privdir()."/pseudomerge"; open MC, ">", $pmf or die "$pmf $!"; print MC <