X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=16c0a0110ab9e6f22a711f9c42790c712c4d7804;hp=4ea34da50a8f975879e0112be509cb98342b9717;hb=bb2d12326a03e8925104937569fdab0ebdc34ccb;hpb=12948968b9a6e48898a5a704a524930da170cd75 diff --git a/dgit.1 b/dgit.1 index 4ea34da5..16c0a011 100644 --- a/dgit.1 +++ b/dgit.1 @@ -346,6 +346,8 @@ For why, see .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 @@ -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. +.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 @@ -584,6 +606,13 @@ your git branch is not a descendant 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.