summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index cffb771..e2b9a3b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,8 +3,10 @@
[advice]
addIgnoredFile = false
+ defaultBranchName = false
detachedHead = false
implicitIdentity = false
+ mergeConflict = false
pushNonFastForward = false
pushUpdateRejected = false
resolveConflict = false
@@ -13,6 +15,8 @@
statusUoption = false
[checkout]
defaultRemote = origin
+[core]
+ abbrev = 12
[diff]
colorMoved = dimmed-zebra
colorMovedWS = allow-indentation-change