repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

git: update git settings

8fdda561bebb2105e1941f99fcdf35041ead4ea0

Oliver Krylow <o.krylow@isp-insoft.de> ·

unsigned

Browse filesCompare with HEAD

Changed files (1)

git/gitconfig

Modified
1 -[alias]
2 - # `git log` with patches shown with difftastic.
3 - dl = -c diff.external=difft log -p --ext-diff
5 - # Show the most recent commit with difftastic.
6 - ds = -c diff.external=difft show --ext-diff
8 - # `git diff` with difftastic.
9 - dft = -c diff.external=difft diff
11 - ci = commit --all
13 - st = status
15 -[core]
16 - editor = nvim
17 - quotepath = false
18 - autocrlf = false
19 - pager = delta
20 - safecrlf = false
21 - symlinks = true
22 - fscache = true
23 - preloadIndex = true
25 -[help]
26 - format = html
28 -[color]
29 - interactive = true
30 - ui = auto
32 -[rebase]
33 - autosquash = true
35 -[diff]
36 - colorMoved = default
37 - tool = difftastic
39 -[difftool]
40 - prompt = false
42 -[difftool "meld"]
43 - cmd = "meld \"$LOCAL\" \"$REMOTE\""
45 -[difftool "difftastic"]
46 - cmd = "difft \"$LOCAL\" \"$REMOTE\""
48 -[pager]
49 - difftool = true
51 -[merge]
52 - tool = vim
54 -[mergetool]
55 - keepBackup = false
56 - prompt = false
58 -[mergetool "meld"]
59 - cmd = "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
61 -[mergetool "vim"]
62 - cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
64 -[push]
65 - autoSetupRemote = true
66 - default = "upstream"
68 -[pull]
69 - rebase = false
71 -[interactive]
72 - diffFilter = delta --color-only
74 -[delta]
75 - side-by-side = true
76 - line-numbers = true
77 - decorations = true
78 - navigate = true
79 - syntax-theme = none
81 -[interactive]
82 - diffFilter = delta --color-only
84 -[init]
85 - defaultBranch = trunk
87 -[commit]
88 - verbose = true
90 -[help]
91 - # try to automatically correct mispelled git commands
92 - autocorrect = 1
94 -[difftool "difftastic"]
95 - # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
96 - cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
98 -[difftool]
99 - # Run the difftool immediately, don't ask 'are you sure' each time.
100 - prompt = false
102 -[pager]
103 - # Use a pager if the difftool output is larger than one screenful,
104 - # consistent with the behaviour of `git diff`.
105 - difftool = true
107 -[diff]
108 - # Set difftastic as the default difftool, so we don't need to specify
109 - # `-t difftastic` every time.
110 - tool = difftastic
112 -# In order to have host-specific configuration, I include additional settings here.
113 -# On each host a different file might be symlinked into '.gitconfig.include'.
114 -[include]
115 - path = .gitconfig.include
1 +[alias]
2 + # `git log` with patches shown with difftastic.
3 + dl = -c diff.external=difft log -p --ext-diff
5 + # Show the most recent commit with difftastic.
6 + ds = -c diff.external=difft show --ext-diff
8 + # `git diff` with difftastic.
9 + dft = -c diff.external=difft diff
11 + ci = commit --all
13 + st = status
15 +[core]
16 + editor = nvim
17 + quotepath = false
18 + autocrlf = false
19 + pager = delta
20 + safecrlf = false
21 + symlinks = true
22 + fscache = true
23 + preloadIndex = true
25 +[filter "lfs"]
26 + clean = git-lfs clean -- %f
27 + smudge = git-lfs smudge -- %f
28 + process = git-lfs filter-process
29 + required = true
31 +[help]
32 + format = html
34 +[color]
35 + interactive = true
36 + ui = auto
38 +[rebase]
39 + autosquash = true
41 +[diff]
42 + colorMoved = default
43 + tool = difftastic
45 +[difftool]
46 + prompt = false
48 +[difftool "meld"]
49 + cmd = "meld \"$LOCAL\" \"$REMOTE\""
51 +[difftool "difftastic"]
52 + cmd = "difft \"$LOCAL\" \"$REMOTE\""
54 +[pager]
55 + difftool = true
57 +[merge]
58 + tool = vim
60 +[mergetool]
61 + keepBackup = false
62 + prompt = false
64 +[mergetool "meld"]
65 + cmd = "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
67 +[mergetool "vim"]
68 + cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
70 +[push]
71 + autoSetupRemote = true
72 + default = "upstream"
74 +[pull]
75 + rebase = false
77 +[interactive]
78 + diffFilter = delta --color-only
80 +[delta]
81 + side-by-side = true
82 + line-numbers = true
83 + decorations = true
84 + navigate = true
85 + syntax-theme = none
87 +[interactive]
88 + diffFilter = delta --color-only
90 +[init]
91 + defaultBranch = trunk
93 +[commit]
94 + verbose = true
96 +[help]
97 + # try to automatically correct mispelled git commands
98 + autocorrect = 1
100 +[difftool "difftastic"]
101 + # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
102 + cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
104 +[difftool]
105 + # Run the difftool immediately, don't ask 'are you sure' each time.
106 + prompt = false
108 +[pager]
109 + # Use a pager if the difftool output is larger than one screenful,
110 + # consistent with the behaviour of `git diff`.
111 + difftool = true
113 +[diff]
114 + # Set difftastic as the default difftool, so we don't need to specify
115 + # `-t difftastic` every time.
116 + tool = difftastic
118 +# In order to have host-specific configuration, I include additional settings here.
119 +# On each host a different file might be symlinked into '.gitconfig.include'.
120 +[include]
121 + path = .gitconfig.include