diff options
Diffstat (limited to 'mac/.config/git/config')
| -rw-r--r-- | mac/.config/git/config | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/mac/.config/git/config b/mac/.config/git/config new file mode 100644 index 0000000..578e556 --- /dev/null +++ b/mac/.config/git/config @@ -0,0 +1,84 @@ +[advice] + detachedHead = false +[core] + autocrlf = input + excludesFile = ~/.config/git/ignore + pager = delta +[color "status"] + added = green + branch = bold magenta + changed = yellow + untracked = blue +[credential] + helper = cache + helper = store + helper = !type pass-git-helper >/dev/null && pass-git-helper$@ +[delta] + blame-code-style = syntax + blame-palette = "#161617" "#1b1b1d" "#2a2a2d" "#3e3e43" + dark = true + features = mellow-barbet + file-style = brightwhite + file-decoration-style = none + file-added-label = [+] + file-copied-label = [==] + file-modified-label = [*] + file-removed-label = [-] + file-renamed-label = [->] + hunk-header-decoration-style = "#3e3e43" box ul + line-numbers = true + line-numbers-minus-style = brightred + line-numbers-plus-style = brightgreen + line-numbers-left-style = "#3e3e43" + line-numbers-right-style = "#3e3e43" + line-numbers-zero-style = "#57575f" + merge-conflict-begin-symbol = ~ + merge-conflict-end-symbol = ~ + merge-conflict-ours-diff-header-style = yellow bold + merge-conflict-ours-diff-header-decoration-style = "#3e3e43" box + merge-conflict-theirs-diff-header-style = yellow bold + merge-conflict-theirs-diff-header-decoration-style = "#3e3e43" box + minus-style = brightred black + minus-emph-style = black red + navigate = true # use n and N to move between diff sections + plus-style = brightgreen black + plus-emph-style = black green + syntax-theme = base16 + side-by-side = false + true-color = auto + whitespace-error-style = black bold + zero-style = syntax +[diff] + colorMoved = default + tool = vscode +[difftool "vscode"] + cmd = code --wait --diff $LOCAL $REMOTE +[include] + path = ~/.config/git/themes.gitconfig +[init] + defaultBranch = master +[interactive] + diffFilter = delta --color-only +[merge] + tool = vscode + conflictstyle = diff3 +[mergetool] + keepBackup = false +[mergetool "vscode"] + cmd = code --wait $MERGED +[pager] + branch = false + diff = delta + log = delta + reflog = delta + show = delta +[pull] + rebase = true + twohead = ort +[rerere] + enabled = true +[submodule] + recurse = true +[user] + name = TheSiahxyz + email = 164138827+TheSiahxyz@users.noreply.github.com |
