chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4abf9e
)
dgit-maint-merge(7): Fix a typo "upsteram"
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 19 Oct 2016 17:29:09 +0000
(18:29 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 20 Oct 2016 19:06:44 +0000
(20:06 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-maint-merge.7.pod
patch
|
blob
|
history
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 7391daf5995b33b0549f1dc5032eb8c57a77dcb3..f8e33b22efca328879a9836edc9b11a8ab0086f0 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-134,7
+134,7
@@
Now create I<debian/gbp.conf>:
=over 4
[DEFAULT]
- upstream-branch = upst
er
am
+ upstream-branch = upst
re
am
debian-branch = master
upstream-tag = %(version)s