From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Oct 2016 17:29:09 +0000 (+0100)
Subject: dgit-maint-merge(7): Fix a typo "upsteram"
X-Git-Tag: archive/debian/2.5~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=637480ca8b3557c346eb6b2eb690c09f2dc922a8

dgit-maint-merge(7): Fix a typo "upsteram"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 7391daf5..f8e33b22 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