summaryrefslogtreecommitdiffstats
path: root/gitconfig
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2012-03-03 14:19:48 -0600
committerJesse Luehrs <doy@tozt.net>2012-03-03 14:20:17 -0600
commit6f8fc3763408a6f88e2d4ae837989f0588ac52f3 (patch)
tree138f4cf085a5a36d8dd5372b4cce965fe25d0c98 /gitconfig
parent89909e266083039589485f0a492d36c4b1b71f0a (diff)
downloadconf-6f8fc3763408a6f88e2d4ae837989f0588ac52f3.tar.gz
conf-6f8fc3763408a6f88e2d4ae837989f0588ac52f3.zip
more git configuration stuff
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig12
1 files changed, 8 insertions, 4 deletions
diff --git a/gitconfig b/gitconfig
index c7727ef..8a05e84 100644
--- a/gitconfig
+++ b/gitconfig
@@ -27,10 +27,7 @@
[github]
user = doy
[color]
- diff = auto
- status = auto
- branch = auto
- interactive = auto
+ ui = auto
[core]
excludesfile = /home/doy/.gitignore
[push]
@@ -46,5 +43,12 @@
autocorrect = 5
[diff]
renames = true
+ mnemonicprefix = true
+[advice]
+ pushNonFastForward = false
+ statusHints = false
+ commitBeforeMerge = false
+ resolveConflict = false
+ detachedHead = false
; vim:ft=gitconfig: