dgit(1): Clarify that --overwrite does nothing if not needed.

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 4cbf10f0dbdc0fc02bb6be7be10d776cbfe2c858..6ee22e822082330ad82f2f2d0ac85c27a82881d2 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -39,10 +39,11 @@ This is the command line reference.
 Please read the tutorial(s):
 .TS
 lb l.
 Please read the tutorial(s):
 .TS
 lb l.

-dgit-user(7)   for users: editing, building and sharing packages
-dgit-nmu-simple(7)     for DDs: doing a straightforward NMU
+dgit-user(7)   for users: edit, build and share packages
+dgit-nmu-simple(7)     for DDs: do a straightforward NMU

 dgit-maint-native(7)   for maintainers of Debian-native packages
 dgit-maint-native(7)   for maintainers of Debian-native packages

-dgit-maint-merge(7)    for maintainers who want a pure git workflow
+dgit-maint-debrebase(7)        for maintainers: a pure-git rebasish workflow
+dgit-maint-merge(7)    for maintainers: a pure-git merging workflow

 dgit-maint-gbp(7)      for maintainers already using git-buildpackage
 dgit-sponsorship(7)    for sponsors and sponsored contributors
 .TE
 dgit-maint-gbp(7)      for maintainers already using git-buildpackage
 dgit-sponsorship(7)    for sponsors and sponsored contributors
 .TE


@@ -117,6 +118,10 @@ that the generated source package corresponds to the relevant git
 commit.
 
 Tagging, signing and actually uploading should be left to dgit push.
 commit.
 
 Tagging, signing and actually uploading should be left to dgit push.

+
+dgit's build operations access the the network,
+to get the -v option right.
+See -v, below.

 .TP
 \fBdgit build-source\fR ...
 Builds the source package, and a changes file for a prospective
 .TP
 \fBdgit build-source\fR ...
 Builds the source package, and a changes file for a prospective


@@ -267,10 +272,19 @@ For why, see
 in
 .BR dgit(7) .
 
 in
 .BR dgit(7) .
 

+If there is an existing macro attribute line
+.B [attr]dgit-defuse-attrs
+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,
+modifies the macro to disable the newer transformations.
+

 (If there is already a macro attribute line
 .B [attr]dgit-defuse-attrs
 in .git/info/attributes
 (If there is already a macro attribute line
 .B [attr]dgit-defuse-attrs
 in .git/info/attributes

-(whatever its effects),
+which does what dgit requires
+(whatever files it effects),

 this operation does nothing further.
 This fact can be used to defeat or partially defeat
 dgit setup-gitattributes
 this operation does nothing further.
 This fact can be used to defeat or partially defeat
 dgit setup-gitattributes


@@ -475,7 +489,7 @@ push will still ensure that the .dsc you upload and the git tree
 you push are identical, so this option won't make broken pushes.)
 .TP
 .BR --overwrite [=\fIprevious-version\fR]
 you push are identical, so this option won't make broken pushes.)
 .TP
 .BR --overwrite [=\fIprevious-version\fR]

-Declare that even though your git branch is not a descendant
+Declare that even though your git branch may not be a descendant

 of the version in the archive
 according to the revision history,
 it really does contain
 of the version in the archive
 according to the revision history,
 it really does contain


@@ -496,7 +510,7 @@ changes unless someone committed to git a finalised changelog
 entry, and then made later changes to that version.)
 
 dgit push --overwrite
 entry, and then made later changes to that version.)
 
 dgit push --overwrite

-will make a
+will, if necessary, make a

 pseudo-merge (that is, something that looks like the result
 of git merge -s ours) to stitch the archive's version into your own
 git history, so that your push is a fast forward from the archive.
 pseudo-merge (that is, something that looks like the result
 of git merge -s ours) to stitch the archive's version into your own
 git history, so that your push is a fast forward from the archive.