chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Fix another tiny typo in an error message
[dgit.git]
/
dgit.1
diff --git
a/dgit.1
b/dgit.1
index 60bf0d3767fc157ae80fa7990a047f9bb76a3d38..d23dde01384c166d71717f2955c104335a3f699d 100644
(file)
--- a/
dgit.1
+++ b/
dgit.1
@@
-338,8
+338,8
@@
which uses
Set up the working tree's
.B .git/info/attributes
to disable all transforming attributes for all files.
Set up the working tree's
.B .git/info/attributes
to disable all transforming attributes for all files.
-This is done by defining a macro attribute
-.B dgit-defuse-attrs
+This is done by defining a macro attribute
,
+.B dgit-defuse-attrs
,
and applying it to
.BR * .
For why, see
and applying it to
.BR * .
For why, see
@@
-355,7
+355,7
@@
in .git/info/attributes,
but it is insufficient,
because it was made by an earlier version of dgit
and git has since introduced new transforming attributes,
but it is insufficient,
because it was made by an earlier version of dgit
and git has since introduced new transforming attributes,
-modifies the macro to disable the newer transformations.
+
this
modifies the macro to disable the newer transformations.
(If there is already a macro attribute line
.B [attr]dgit-defuse-attrs
(If there is already a macro attribute line
.B [attr]dgit-defuse-attrs
@@
-448,7
+448,7
@@
and dgit actually imports the dsc
dgit will make a pseudomerge
so that the result is necessarily fast forward
from the existing branch.
dgit will make a pseudomerge
so that the result is necessarily fast forward
from the existing branch.
-Otherwise, if
branch
already exists,
+Otherwise, if
\fIbranch\fR
already exists,
dgit will stop with an error message.
If
dgit will stop with an error message.
If
@@
-542,7
+542,9
@@
to avoid needing the build-dependencies.
dgit will only actually clean the tree if it needs to
(because it needs to build the source package
or binaries from your working tree).
dgit will only actually clean the tree if it needs to
(because it needs to build the source package
or binaries from your working tree).
-Otherwise any untracked files will be simply ignored.
+Otherwise
+it will just check that there are no untracked unignored files.
+See --clean=git[-ff],always, below.
.TP
.BR --clean=git-ff " | " -wgf
Use
.TP
.BR --clean=git-ff " | " -wgf
Use
@@
-553,6
+555,10
@@
git clean -xdf
but it also removes any subdirectories containing different git
trees (which only unusual packages are likely to create).
.TP
but it also removes any subdirectories containing different git
trees (which only unusual packages are likely to create).
.TP
+.BR --clean=git "[" -ff "]" ,always " | " -wga " | " -wgfa
+Like --clean=git, but always does the clean and not just a check,
+deleting any untracked un-ignored files.
+.TP
.BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci
Merely check that the tree is clean (does not contain uncommitted
files).
.BR --clean=check " | " --clean=check,ignores " | " -wc " | " -wci
Merely check that the tree is clean (does not contain uncommitted
files).
@@
-769,7
+775,7
@@
The use of --deliberately is declared and published in the signed tags
generated for you by dgit,
so that the archive software can give effect to your intent,
and
generated for you by dgit,
so that the archive software can give effect to your intent,
and
-for the benefit humans looking at the history.
+for the benefit
of
humans looking at the history.
The meanings of
.IR something s
understood in the context of Debian are discussed below:
The meanings of
.IR something s
understood in the context of Debian are discussed below:
@@
-846,7
+852,7
@@
because the dgit git tree does not have a
directory.)
.TP
.BR --quilt=nocheck " | " --no-quilt-fixup
directory.)
.TP
.BR --quilt=nocheck " | " --no-quilt-fixup
-Do not check whether
up
source format `3.0 (quilt)' metadata needs
+Do not check whether source format `3.0 (quilt)' metadata needs
fixing up. If you use this option and the metadata did in fact need
fixing up, dgit push will fail.
.TP
fixing up. If you use this option and the metadata did in fact need
fixing up, dgit push will fail.
.TP
@@
-927,7
+933,7
@@
How to set this up is not yet documented.
.TP
.BI -C changesfile
Specifies the .changes file which is to be uploaded. By default
.TP
.BI -C changesfile
Specifies the .changes file which is to be uploaded. By default
-dgit push looks for single .changes file in the parent directory whose
+dgit push looks for
a
single .changes file in the parent directory whose
filename suggests it is for the right package and version.
If the specified
filename suggests it is for the right package and version.
If the specified
@@
-1284,7
+1290,7
@@
One of the values for the command line --clean= option; used if
.TP
.BR dgit-distro. \fIdistro\fR .clean-mode-newer
Like .clean-mode,
.TP
.BR dgit-distro. \fIdistro\fR .clean-mode-newer
Like .clean-mode,
-but ignored if the value
does not make sense
to this version of dgit.
+but ignored if the value
is unknown
to this version of dgit.
Setting both .clean-mode and .clean-mode-newer is useful
to provide a single git config compatible with different dgit versions.
.TP
Setting both .clean-mode and .clean-mode-newer is useful
to provide a single git config compatible with different dgit versions.
.TP
@@
-1322,10
+1328,10
@@
used, respectively. Only used if .setup-usermail is not disabled.
.TP
.BI dgit-distro. distro .setup-useremail
Whether to set user.name and user.email in new git trees.
.TP
.BI dgit-distro. distro .setup-useremail
Whether to set user.name and user.email in new git trees.
-True by default. Ignored for dgit setup-
setup-
useremail, which does it anyway.
+True by default. Ignored for dgit setup-useremail, which does it anyway.
.TP
.BI dgit-distro. distro .setup-mergechangelogs
.TP
.BI dgit-distro. distro .setup-mergechangelogs
-Whether to setup a merge driver which uses dpkg-mergechangelogs for
+Whether to set
up a merge driver which uses dpkg-mergechangelogs for
debian/changelog. True by default. Ignored for dgit
setup-mergechangelogs, which does it anyway.
.TP
debian/changelog. True by default. Ignored for dgit
setup-mergechangelogs, which does it anyway.
.TP
@@
-1349,8
+1355,9
@@
Works like
To pass several options, configure multiple values in git config
(with git config --add). The options for
.BI dgit.default.opts- cmd
To pass several options, configure multiple values in git config
(with git config --add). The options for
.BI dgit.default.opts- cmd
+and
.BI dgit-distro. distro /push.opts- cmd
.BI dgit-distro. distro /push.opts- cmd
-a
nd a
re all used, followed by options from dgit's command line.
+are all used, followed by options from dgit's command line.
.SH ACCESS CONFIGURATION
There are many other settings which specify how a particular distro's
services (archive and git) are provided. These should not normally be
.SH ACCESS CONFIGURATION
There are many other settings which specify how a particular distro's
services (archive and git) are provided. These should not normally be