path: root/dgit.1
diff options
authorIan Jackson <>2016-10-23 20:26:40 +0100
committerIan Jackson <>2016-10-30 19:50:47 +0000
commitf5b95599f4cafe664fd2f218d47ec9248605f698 (patch)
treeae2e91cd383dfd3e9df405c5cbc4dff566e88e60 /dgit.1
parent4fcc733b6194bdee895424cab72874e98ea42816 (diff)
import-dsc: Document new ff checks
Signed-off-by: Ian Jackson <>
Diffstat (limited to 'dgit.1')
1 files changed, 20 insertions, 1 deletions
diff --git a/dgit.1 b/dgit.1
index c2541f0..2c583fe 100644
--- a/dgit.1
+++ b/dgit.1
@@ -240,7 +240,7 @@ other kinds of more exotic history. If dgit can't find a suitable
linearisation of your history, by default it will fail, but you can
ask it to generate a single squashed patch instead.
-.BI "dgit import-dsc " ../path/to/.dsc branch
+\fBdgit import-dsc\fR \fI../path/to/.dsc\fR [\fB+\fR|\fB..\fR]branch
Import a Debian-format source package,
specified by its .dsc,
into git,
@@ -259,6 +259,25 @@ into any existing git history.
.I branch
+is prefixed with
+.B +
+then if it already exists, it will be simply ovewritten,
+no matter its existing contents.
+.I branch
+is prefixed with
+.B ..
+then if it already exists
+and dgit actually imports the dsc
+(rather than simply reading the git commit out of the Dgit field),
+dgit will make a pseudomerge
+so that the result is necessarily fast forward
+from the existing branch.
+Otherwise, if branch already exists,
+dgit will stop with an error message.
+.I branch
does not start with refs/, refs/heads/ is prepended.
The specified branch is unconditionally updated.