git-debrebase: walk: Reintroduce the local $read_tree_upstream sub

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index a4b169430040c02e93138ac3ddec9bbd223ba61e..a21f212dc94382ae528a028254122585a7b15937 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -471,6 +471,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


@@ -661,7 +681,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 +701,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