summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-26 00:33:49 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-26 01:36:35 +0100
commita96666fd8cd9fedd9bf988bc2f3a904401c21498 (patch)
treecb029b5a3a1adcc40722dec4d01c2aa34f79f1a8
parent5053f93da9652c68839b4d982252b5561cf66d6e (diff)
Overwrite: Fix messages referring to --overwrite-version
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit4
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit b/dgit
index 4e31605..18e485a 100755
--- 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;