From 3bbb8308d6bac2472d2de540be1bdece3d3d480c Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Wed, 13 Apr 2022 09:45:39 +0300 Subject: git: gitconfig parity --- .gitconfig##h.lowe | 20 ++++++++++++++++++++ .gitconfig##h.luchs | 30 +++++++++++++++++++++++++++++- .gitconfig##h.maus | 20 ++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/.gitconfig##h.lowe b/.gitconfig##h.lowe index 4e44bee..401e691 100644 --- a/.gitconfig##h.lowe +++ b/.gitconfig##h.lowe @@ -18,10 +18,23 @@ sl = log --oneline --decorate -20 sla = log --oneline --decorate --graph --all -20 branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes + dft = difftool [credential] helper = cache --timeout=3600 [color] ui = true +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 +[color "diff"] + meta = yellow + frag = magenta bold + commit = yellow bold + old = red bold + new = green bold + whitespace = red reverse [commit] gpgsign = true [sendemail] @@ -32,7 +45,14 @@ ff = only [init] defaultBranch = main +[diff] + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" [pager] + difftool = true diff = delta log = delta reflog = delta diff --git a/.gitconfig##h.luchs b/.gitconfig##h.luchs index 5ad9aeb..195fb06 100644 --- a/.gitconfig##h.luchs +++ b/.gitconfig##h.luchs @@ -5,7 +5,6 @@ [core] autocrlf = input safecrlf = true - pager = diff-so-fancy | less --tabs=4 -RFX excludesfile = ~/.cvsignore [alias] co = checkout @@ -19,6 +18,7 @@ sl = log --oneline --decorate -20 sla = log --oneline --decorate --graph --all -20 branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes + dft = difftool [credential] helper = cache --timeout=3600 [color] @@ -45,3 +45,31 @@ ff = only [init] defaultBranch = main +[diff] + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[pager] + difftool = true + diff = delta + log = delta + reflog = delta + show = delta +[interactive] + diffFilter = delta --color-only +[delta] + features = line-numbers decorations side-by-side + plus-style = syntax "#003800" + minus-style = syntax "#3f0001" +[delta "decorations"] + commit-decoration-style = bold yellow box ul + file-style = bold yellow ul + file-decoration-style = none + hunk-header-decoration-style = cyan box ul +[delta "line-numbers"] + line-numbers-left-style = cyan + line-numbers-right-style = cyan + line-numbers-minus-style = 124 + line-numbers-plus-style = 28 diff --git a/.gitconfig##h.maus b/.gitconfig##h.maus index 75f6615..9334767 100644 --- a/.gitconfig##h.maus +++ b/.gitconfig##h.maus @@ -53,3 +53,23 @@ cmd = difft "$LOCAL" "$REMOTE" [pager] difftool = true + diff = delta + log = delta + reflog = delta + show = delta +[interactive] + diffFilter = delta --color-only +[delta] + features = line-numbers decorations side-by-side + plus-style = syntax "#003800" + minus-style = syntax "#3f0001" +[delta "decorations"] + commit-decoration-style = bold yellow box ul + file-style = bold yellow ul + file-decoration-style = none + hunk-header-decoration-style = cyan box ul +[delta "line-numbers"] + line-numbers-left-style = cyan + line-numbers-right-style = cyan + line-numbers-minus-style = 124 + line-numbers-plus-style = 28 -- cgit v1.2.3-70-g09d2