summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
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