summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-19 18:29:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-20 20:06:44 +0100
commit637480ca8b3557c346eb6b2eb690c09f2dc922a8 (patch)
tree2647e113bed5c44feabf54312baabb097c57fb7c /dgit-maint-merge.7.pod
parentf4abf9e82d21a452741f53bd0ca67c1b087908d4 (diff)
dgit-maint-merge(7): Fix a typo "upsteram"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-merge.7.pod')
-rw-r--r--dgit-maint-merge.7.pod2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 7391daf..f8e33b2 100644
--- 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 = upsteram
+ upstream-branch = upstream
debian-branch = master
upstream-tag = %(version)s