summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 7eb2fbb..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