changelog: finalise 3.12

[dgit.git] / dgit.7

diff --git a/dgit.7 b/dgit.7
index 09bb8f4424f9d235e8ca115b61c593980bfd93ae..70165a1b69d0d9f745ae6e2f2a92135f985a8870 100644 (file)
--- a/dgit.7
+++ b/dgit.7
@@ -205,6 +205,9 @@ is configured this way.
 git has features which can automatically transform files
 as they are being copied between the working tree
 and the git history.
 git has features which can automatically transform files
 as they are being copied between the working tree
 and the git history.

+The attributes can be specified in the source tree itself,
+in
+.BR .gitattributes .

 See \fBgitattributes\fP(5).
 
 These transformations are context-sensitive
 See \fBgitattributes\fP(5).
 
 These transformations are context-sensitive


@@ -213,25 +216,23 @@ so dgit operates on the principle that
 the dgit git history contains the actual contents of the package.
 (When dgit is manipulating a .dsc,
 it does so in a private area,
 the dgit git history contains the actual contents of the package.
 (When dgit is manipulating a .dsc,
 it does so in a private area,

-where the transforming gitattributes are defused (disabled),
+where the transforming gitattributes are defused,

 to achieve this.)
 
 to achieve this.)
 

-If transforming gitattributes used,
+If transforming gitattributes are used,

 they can cause trouble,
 because the working tree files can differ from
 the git revision history
 (and therefore from the source packages).
 they can cause trouble,
 because the working tree files can differ from
 the git revision history
 (and therefore from the source packages).

+dgit warns if it finds a .gitattributes file
+(in a package being fetched or imported),
+unless the transforming gitattributes have been defused.

 
 

-So dgit clone
+dgit clone

 and dgit setup-new-tree
 disable transforming gitattributes
 by default,
 and dgit setup-new-tree
 disable transforming gitattributes
 by default,

-by creating a .git/info/attributes.
-When fetching or importing sources
-dgit warns if it finds .gitattributes file
-and the transforming gitattributes have not been defused
-(e.g. in the case of a tree not made with dgit clone).
-
+by creating a suitable .git/info/attributes.

 See
 .B dgit setup-new-tree
 and
 See
 .B dgit setup-new-tree
 and