summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig17
1 files changed, 15 insertions, 2 deletions
diff --git a/.gitconfig b/.gitconfig
index 3ba30d2..ff5df52 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,15 +14,28 @@
showbranch = true
status = true
+[color.diff]
+ oldMoved = normal red
+ oldMovedDimmed = normal red dim
+ oldMovedAlternative = normal red italic
+ oldMovedAlternativeDimmed = normal red italic dim
+ newMoved = normal green
+ newMovedDimmed = normal green dim
+ newMovedAlternative = normal green italic
+ newMovedAlternativeDimmed = normal green italic dim
+
[fetch]
- prune = true
+ prune = true
+[fetch.fsck]
+ zeroPaddedFilemode = warn
[push]
default = tracking
[pull]
- rebase = preserve
+ rebase = merges
[diff]
mnemonicprefix = true
renames = copies
+ colorMoved = zebra
[log]
decorate = short
date = iso