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:
abb1e1f
)
git: push default simple
author
Ian Jackson
<ian.jackson@eu.citrix.com>
Thu, 13 Sep 2018 16:43:00 +0000
(17:43 +0100)
committer
Ian Jackson
<ian.jackson@eu.citrix.com>
Thu, 13 Sep 2018 16:43:00 +0000
(17:43 +0100)
templates/gitconfig.in
patch
|
blob
|
history
diff --git
a/templates/gitconfig.in
b/templates/gitconfig.in
index 211e36cc19c690a5074f4ba8e8eb21f0703fe40a..b5f04a7bae9992e7aa7cec8341ce8e2774cc9c1f 100755
(executable)
--- a/
templates/gitconfig.in
+++ b/
templates/gitconfig.in
@@
-69,6
+69,8
@@
cat <<END
[color]
diff = false
ui = false
+[push]
+ default = simple
[merge]
conflictStyle = diff3
[branch]