diff options
-rw-r--r-- | .gitconfig##h.lowe | 20 | ||||
-rw-r--r-- | .gitconfig##h.luchs | 30 | ||||
-rw-r--r-- | .gitconfig##h.maus | 20 |
3 files changed, 69 insertions, 1 deletions
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 @@ | |||
18 | sl = log --oneline --decorate -20 | 18 | sl = log --oneline --decorate -20 |
19 | sla = log --oneline --decorate --graph --all -20 | 19 | sla = log --oneline --decorate --graph --all -20 |
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 | 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 |
21 | dft = difftool | ||
21 | [credential] | 22 | [credential] |
22 | helper = cache --timeout=3600 | 23 | helper = cache --timeout=3600 |
23 | [color] | 24 | [color] |
24 | ui = true | 25 | ui = true |
26 | [color "diff-highlight"] | ||
27 | oldNormal = red bold | ||
28 | oldHighlight = red bold 52 | ||
29 | newNormal = green bold | ||
30 | newHighlight = green bold 22 | ||
31 | [color "diff"] | ||
32 | meta = yellow | ||
33 | frag = magenta bold | ||
34 | commit = yellow bold | ||
35 | old = red bold | ||
36 | new = green bold | ||
37 | whitespace = red reverse | ||
25 | [commit] | 38 | [commit] |
26 | gpgsign = true | 39 | gpgsign = true |
27 | [sendemail] | 40 | [sendemail] |
@@ -32,7 +45,14 @@ | |||
32 | ff = only | 45 | ff = only |
33 | [init] | 46 | [init] |
34 | defaultBranch = main | 47 | defaultBranch = main |
48 | [diff] | ||
49 | tool = difftastic | ||
50 | [difftool] | ||
51 | prompt = false | ||
52 | [difftool "difftastic"] | ||
53 | cmd = difft "$LOCAL" "$REMOTE" | ||
35 | [pager] | 54 | [pager] |
55 | difftool = true | ||
36 | diff = delta | 56 | diff = delta |
37 | log = delta | 57 | log = delta |
38 | reflog = delta | 58 | 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 @@ | |||
5 | [core] | 5 | [core] |
6 | autocrlf = input | 6 | autocrlf = input |
7 | safecrlf = true | 7 | safecrlf = true |
8 | pager = diff-so-fancy | less --tabs=4 -RFX | ||
9 | excludesfile = ~/.cvsignore | 8 | excludesfile = ~/.cvsignore |
10 | [alias] | 9 | [alias] |
11 | co = checkout | 10 | co = checkout |
@@ -19,6 +18,7 @@ | |||
19 | sl = log --oneline --decorate -20 | 18 | sl = log --oneline --decorate -20 |
20 | sla = log --oneline --decorate --graph --all -20 | 19 | sla = log --oneline --decorate --graph --all -20 |
21 | branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes | 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 |
21 | dft = difftool | ||
22 | [credential] | 22 | [credential] |
23 | helper = cache --timeout=3600 | 23 | helper = cache --timeout=3600 |
24 | [color] | 24 | [color] |
@@ -45,3 +45,31 @@ | |||
45 | ff = only | 45 | ff = only |
46 | [init] | 46 | [init] |
47 | defaultBranch = main | 47 | defaultBranch = main |
48 | [diff] | ||
49 | tool = difftastic | ||
50 | [difftool] | ||
51 | prompt = false | ||
52 | [difftool "difftastic"] | ||
53 | cmd = difft "$LOCAL" "$REMOTE" | ||
54 | [pager] | ||
55 | difftool = true | ||
56 | diff = delta | ||
57 | log = delta | ||
58 | reflog = delta | ||
59 | show = delta | ||
60 | [interactive] | ||
61 | diffFilter = delta --color-only | ||
62 | [delta] | ||
63 | features = line-numbers decorations side-by-side | ||
64 | plus-style = syntax "#003800" | ||
65 | minus-style = syntax "#3f0001" | ||
66 | [delta "decorations"] | ||
67 | commit-decoration-style = bold yellow box ul | ||
68 | file-style = bold yellow ul | ||
69 | file-decoration-style = none | ||
70 | hunk-header-decoration-style = cyan box ul | ||
71 | [delta "line-numbers"] | ||
72 | line-numbers-left-style = cyan | ||
73 | line-numbers-right-style = cyan | ||
74 | line-numbers-minus-style = 124 | ||
75 | 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 @@ | |||
53 | cmd = difft "$LOCAL" "$REMOTE" | 53 | cmd = difft "$LOCAL" "$REMOTE" |
54 | [pager] | 54 | [pager] |
55 | difftool = true | 55 | difftool = true |
56 | diff = delta | ||
57 | log = delta | ||
58 | reflog = delta | ||
59 | show = delta | ||
60 | [interactive] | ||
61 | diffFilter = delta --color-only | ||
62 | [delta] | ||
63 | features = line-numbers decorations side-by-side | ||
64 | plus-style = syntax "#003800" | ||
65 | minus-style = syntax "#3f0001" | ||
66 | [delta "decorations"] | ||
67 | commit-decoration-style = bold yellow box ul | ||
68 | file-style = bold yellow ul | ||
69 | file-decoration-style = none | ||
70 | hunk-header-decoration-style = cyan box ul | ||
71 | [delta "line-numbers"] | ||
72 | line-numbers-left-style = cyan | ||
73 | line-numbers-right-style = cyan | ||
74 | line-numbers-minus-style = 124 | ||
75 | line-numbers-plus-style = 28 | ||