summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 02:11:49 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 13:43:11 +0100
commit16a5072a1f86be398577336e569b8c16a84d0560 (patch)
treefc66ee2679c52b0d9707c49af7387bf8c70c68f8 /dgit
parentf979515f2b1567e93fa3b3bb18ad026107ce14a3 (diff)
dgit: baredebian: Note upstream commitish source in prose
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index fccf48e..831a60c 100755
--- a/dgit
+++ b/dgit
@@ -5415,7 +5415,7 @@ END
my $upsversion = upstreamversion $version;
my $merge = make_commit
[ $headref, $quilt_upstream_commitish ],
- [ +(f_ <<ENDT, $upsversion), <<ENDU ];
+ [ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message, <<ENDU ];
Combine debian/ with upstream source for %s
ENDT
[dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]