diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f88bc38..88ec5bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dgit (2.3~) unstable; urgency=medium - * + * When generating pseudomerge in quilt split brain mode due to + --overwrite, actually include the version number in the commit + message. -- @@ -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 |