aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/.gitconfig9
1 files changed, 8 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig
index 1a38a2c..6ce704b 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -25,4 +25,11 @@
ar = !sh -c 'git archive --format=tar --prefix="$(basename "$PWD")-$1/" $1^{tree} | bzip2 >"$(basename "$PWD")-$1.tar.bz2"' -
history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')"
[push]
- default = matching
+ default = matching
+[advice]
+ statusHints = false
+[branch]
+ autosetupmerge = always
+ autosetuprebase = local
+[help]
+ autocorrect = 10