aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2025-03-17 03:01:24 +0900
committernsfisis <nsfisis@gmail.com>2025-03-17 03:01:24 +0900
commit3eea2185259bc9a0499a97b345239b0b6ff68849 (patch)
treefef106cb63ec1e944f32baad0fb2f8988d04d740
parent8ccfdf9f15c2bb28b0b2ee3b5c80367bd1f6152f (diff)
downloaddotfiles-3eea2185259bc9a0499a97b345239b0b6ff68849.tar.gz
dotfiles-3eea2185259bc9a0499a97b345239b0b6ff68849.tar.zst
dotfiles-3eea2185259bc9a0499a97b345239b0b6ff68849.zip
git: make configurations better
https://blog.gitbutler.com/how-git-core-devs-configure-git/
-rw-r--r--.config/git/config27
1 files changed, 27 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
index 3c154d6..383089c 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -6,15 +6,33 @@
[advice]
detachedhead = false
+[help]
+ autocorrect = prompt
+
[color]
ui = true
+[column]
+ ui = auto
+
+[tag]
+ sort = version:refname
+
[commit]
status = false
+[fetch]
+ prune = true
+ prunetags = true
+ all = true
+
+[pull]
+ rebase = true
+
[merge]
tool = vimdiff
ff = false
+ conflictstyle = zdiff3
[mergetool "vimdiff"]
cmd = "__fn() { \
@@ -29,8 +47,17 @@
abbreviatecommands = true
autosquash = true
autostash = true
+ updaterefs = true
+
+[rerere]
+ enabled = true
+ autoupdate = true
[diff]
+ algorithm = histogram
+ colormoved = plain
+ mnemonicprefix = true
+ renames = true
tool = vimdiff
[difftool "vimdiff"]