From cf7545b7a4f3a074041535dd9578c86ba4c0f1e1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 19 Aug 2013 20:48:32 +0100 Subject: Assorted manpage fixes. --- debian/changelog | 2 +- dgit.1 | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b21abe..f40ba5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ dgit (0.4) experimental; urgency=low * Use dgit.debian.net vhost on alioth. Closes #720172. - * Fix manpage description of --existing-package. + * Assorted manpage fixes. -- diff --git a/dgit.1 b/dgit.1 index fad5c17..a62121c 100644 --- a/dgit.1 +++ b/dgit.1 @@ -104,12 +104,12 @@ working branches If last upload was not made with git, a different approach is required to start using dgit. First, do .B dgit fetch -(or clone) obtain a git history representation of what's in the +(or clone) to obtain a git history representation of what's in the archive and record it in the .BI remotes/dgit/ suite -tracking branch. Then construct somehow, using your other git history +tracking branch. Then somehow, using your other git history plus appropriate diffs and cherry picks from the dgit remote tracking -branch, a git commit whose tree corresponds to the tree to use for the +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 .BR "git merge -s ours remotes/dgit/" \fIsuite\fR; @@ -246,6 +246,15 @@ package we are trying to push. But with --new that will not work, so we guess .B dpkg or use the value of this option. +.SH SEE ALSO +\fBdget\fP(1), +\fBdput\fP(1), +\fBdebsign\fP(1), +\fBgit-config\fP(1), +\fBgit-buildpackage\fP(1), +\fBdpkg-buildpackage\fP(1), +.br +https://wiki.debian.org/Alioth .SH CONFIGURATION dgit looks at the following git config keys to control its behaviour. You may set them with git-config (either in system-global or per-tree -- cgit v1.2.3