chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in gbp.conf
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 19950d4e7dd7e2ca03e7f97714ad7162ac99661e..3919fa8b5b73f23d4f29a0276dd3c92ea6f6ac78 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-166,7
+166,7
@@
Now create I<debian/gbp.conf>:
[DEFAULT]
upstream-branch = upstream
debian-branch = master
[DEFAULT]
upstream-branch = upstream
debian-branch = master
- upstream-tag = %(version)s
+ upstream-tag =
upstream/
%(version)s
sign-tags = True
pristine-tar = False
sign-tags = True
pristine-tar = False
@@
-393,6
+393,8
@@
or if you have a working watch file
=back
=back
+In the following, replace I<1.2.3> with I<upstream/1.2.3>.
+
=head2 Reviewing & merging the release
It's a good idea to preview the merge of the new upstream release.
=head2 Reviewing & merging the release
It's a good idea to preview the merge of the new upstream release.