X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=c5d76884871315a815cfa6f2dd6fbd24de8d8726;hb=9f4a5f045e36edddb3ffd23667a52f4ee319c675;hp=4cbf10f0dbdc0fc02bb6be7be10d776cbfe2c858;hpb=4eee70a2b1710c1a8fc71fbd3cdc7064682a799c;p=dgit.git

diff --git a/dgit.1 b/dgit.1
index 4cbf10f0..c5d76884 100644
--- a/dgit.1
+++ b/dgit.1
@@ -39,10 +39,11 @@ This is the command line reference.
 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-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
@@ -267,10 +268,19 @@ For why, see
 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
-(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