diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 01:33:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-18 01:44:23 +0100 |
commit | 12da50e85e2fe58f537d8eb1c3b06f1377e373c9 (patch) | |
tree | 60ccbc039c5a717bc8a0f4a3a270e650573ea14b /dgit | |
parent | a56fc8384e1aaae7d279b74269b706156a6da962 (diff) |
pseudomerge: When generating pseudomerge in quilt split brain mode due to --overwrite, actually include the version number in the commit message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2912,7 +2912,7 @@ sub splitbrain_pseudomerge ($$$$) { $clogp, $dgitview, $archive_hash, $i_arch_v, "dgit --quilt=$quilt_mode", (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF); -Declare fast forward from $overwrite_version +Declare fast forward from $i_arch_v->[0] END_OVERWR Make fast forward from $i_arch_v->[0] END_MAKEFF |