From 0c6d20548f1a8c5dd9d0b480713019aa2b7ace91 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 14 Aug 2015 12:01:04 +0100 Subject: Fix manpage typo `dig' for `dgit'. --- debian/changelog | 2 +- dgit.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 065fcf6..a9c7cbb 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 88e9812..f92cf48 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. -- cgit v1.2.3