chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: defdistro-dsd-clone-drs: New test
[dgit.git]
/
dgit.1
diff --git
a/dgit.1
b/dgit.1
index 88691496699a98de7fb0156e41adb4916aed4619..e5b4bb050b6145a30a72299733622b768677c125 100644
(file)
--- a/
dgit.1
+++ b/
dgit.1
@@
-1024,6
+1024,12
@@
Whether to setup 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
+.BI dgit-distro. distro .setup-gitattributes
+Whether to configure .git/info/attributes
+to suppress checkin/checkout file content transformations
+in new git trees.
+True by default. Ignored for dgit setup-gitattributes, which does it anyway.
+.TP
.BI dgit-distro. distro .cmd- cmd
Program to use instead of
.IR cmd .
.BI dgit-distro. distro .cmd- cmd
Program to use instead of
.IR cmd .