git-debrebase: Do not abandon quilt fixup at gdr split commits

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 6158736ea2917984948c3217da5b383a40edbee6..16c0a0110ab9e6f22a711f9c42790c712c4d7804 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -346,6 +346,8 @@ For why, see
 .B GITATTRIBUTES
 in
 .BR dgit(7) .
 .B GITATTRIBUTES
 in
 .BR dgit(7) .

+Note that only attributes affecting the working tree are suppressed.
+git-archive may remain exciting.

 
 If there is an existing macro attribute line
 .B [attr]dgit-defuse-attrs
 
 If there is an existing macro attribute line
 .B [attr]dgit-defuse-attrs


@@ -471,6 +473,26 @@ to cause it to exclude exactly the .git diredcory
 and nothing else.
 The separate arguments are unquoted, separated by spaces,
 and do not contain spaces.
 and nothing else.
 The separate arguments are unquoted, separated by spaces,
 and do not contain spaces.

+.TP
+.B dgit print-unapplied-treeish
+Constructs a tree-ish approximating the patches-unapplied state
+of your 3.0 (quilt) package,
+and prints the git object name to stdout.
+This requires appropriate .orig tarballs.
+This tree object is identical to your .origs
+as regards upstream files.
+The contents of the debian subdirectory is not interesting
+and should not be inspected;
+except that debian/patches will be identical to your HEAD.
+
+To make this operate off-line,
+the access configuration key
+which is used to determine the build-products-dir
+is the uncanonicalised version of the suite name from the changelog,
+or (of course) dgit.default.build-products-dir.
+See ACCESS CONFIGURATION, below.
+
+This function is primarily provided for the benefit of git-debrebase.

 .SH OPTIONS
 .TP
 .BR --dry-run " | " -n
 .SH OPTIONS
 .TP
 .BR --dry-run " | " -n


@@ -584,6 +606,13 @@ your git branch is not a descendant
 of the version in the archive
 according to the git revision history.
 
 of the version in the archive
 according to the git revision history.
 

+It is safer not to specify
+.IR previous-version ,
+and usually it's not needed.
+Just say
+.BR --overwrite ,
+unless you know what you are doing.
+

 This option is useful if you are the maintainer, and you have
 incorporated NMU changes into your own git workflow in a way that
 doesn't make your branch a fast forward from the NMU.
 This option is useful if you are the maintainer, and you have
 incorporated NMU changes into your own git workflow in a way that
 doesn't make your branch a fast forward from the NMU.


@@ -661,7 +690,7 @@ Also,
 it can mean that
 dgit fails to find necessary git commits.
 .TP
 it can mean that
 dgit fails to find necessary git commits.
 .TP

-.BR --dgit-view-save= \fIbranch\fR|\fIref\fR
+.BR --save-dgit-view= \fIbranch\fR|\fIref\fR

 Specifies that when a split view quilt mode is in operation,
 and dgit calculates
 (or looks up in its cache)
 Specifies that when a split view quilt mode is in operation,
 and dgit calculates
 (or looks up in its cache)


@@ -681,6 +710,10 @@ And it is only effective with
 If ref does not start with refs/
 it is taken to to be a branch -
 i.e. refs/heads/ is prepended.
 If ref does not start with refs/
 it is taken to to be a branch -
 i.e. refs/heads/ is prepended.

+
+.B --dgit-view-save
+is a deprecated alias for
+--save-dgit-view.

 .TP
 .BI --deliberately- something
 Declare that you are deliberately doing
 .TP
 .BI --deliberately- something
 Declare that you are deliberately doing


@@ -877,14 +910,20 @@ Note that \fBdgit push-source\fR will always find the right .changes,
 regardless of this option.
 .TP
 .BI --build-products-dir= directory
 regardless of this option.
 .TP
 .BI --build-products-dir= directory

-Specifies where to find the built files to be uploaded.
-By default, dgit looks in the parent directory
+Specifies where to find and create tarballs, binry packages,
+source packages, .changes files, and so on.
+
+By default, dgit uses the parent directory

 .RB ( .. ).
 
 .RB ( .. ).
 

-Also see the
+Changing this setting may necessitate
+moving .orig tarballs to the new directory,
+so it is probably best to
+use the

 .BI dgit.default.build-products-dir
 .BI dgit.default.build-products-dir

-configuration option
-(which this command line option overrides).
+configuration setting
+(see CONFIGURATION, below)
+which this command line option overrides).

 .TP
 .BI --no-rm-on-error
 Do not delete the destination directory if clone fails.
 .TP
 .BI --no-rm-on-error
 Do not delete the destination directory if clone fails.