chiark / gitweb /
Overwrite: Fix messages referring to --overwrite-version
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 25 Sep 2016 23:33:49 +0000 (00:33 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 26 Sep 2016 00:36:35 +0000 (01:36 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index 4e31605adbf711c3c68232f17085d3eb2b586841..18e485a0bbcdbf6828bc558e1b7d4ebdd3ede78a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2480,7 +2480,7 @@ sub splitbrain_pseudomerge ($$$$) {
        (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
 Declare fast forward from $overwrite_version
 
-[dgit --quilt=$quilt_mode --overwrite-version=$overwrite_version]
+[dgit --quilt=$quilt_mode --overwrite=$overwrite_version]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 
@@ -2516,7 +2516,7 @@ sub plain_overwrite_pseudomerge ($$$) {
        $clogp, $head, $archive_hash, $i_arch_v, <<END;
 $m
 
-[dgit --overwrite-version=$overwrite_version]
+[dgit --overwrite=$overwrite_version]
 END
 
     runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;