chiark
/
gitweb
/
~ian
/
ian-dotfiles.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd34cab
)
gitconfig: some dgit things from zealot
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 13 Sep 2018 16:22:27 +0000
(17:22 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 13 Sep 2018 16:22:27 +0000
(17:22 +0100)
templates/gitconfig.in
patch
|
blob
|
history
diff --git
a/templates/gitconfig.in
b/templates/gitconfig.in
index 65e961bcd2fd1fe8441ad1c79bf8365e91d972c7..f645c590c070564a092d82acb4b1f09f1dbebc41 100755
(executable)
--- a/
templates/gitconfig.in
+++ b/
templates/gitconfig.in
@@
-60,4
+60,7
@@
cat <<END
conflictStyle = diff3
[branch]
autoSetupMerge = false
+[dgit "default"]
+ clean-mode = git
+ build-products-dir = ../bpd
END