From: Ian Jackson Date: Fri, 14 Aug 2015 11:01:04 +0000 (+0100) Subject: Fix manpage typo `dig' for `dgit'. X-Git-Tag: debian/1.2~25 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0c6d20548f1a8c5dd9d0b480713019aa2b7ace91;ds=sidebyside Fix manpage typo `dig' for `dgit'. --- diff --git a/debian/changelog b/debian/changelog index 065fcf60..a9c7cbb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (1.2~~) UNRELEASED; urgency=low - * + * Fix manpage typo `dig' for `dgit'. -- diff --git a/dgit.1 b/dgit.1 index 88e98128..f92cf488 100644 --- a/dgit.1 +++ b/dgit.1 @@ -610,7 +610,7 @@ tracking branch. Then somehow, using your other git history plus appropriate diffs and cherry picks from the dgit remote tracking branch, construct a git commit whose tree corresponds to the tree to use for the next upload. If that commit-to-be-uploaded is not a descendant of the -dig remote tracking branch, check it out and say +dgit remote tracking branch, check it out and say .BR "git merge -s ours remotes/dgit/dgit/" \fIsuite\fR; that tells git that we are deliberately throwing away any differences between what's in the archive and what you intend to upload.