diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/dot-config/git/config | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/git/dot-config/git/config b/git/dot-config/git/config index 62ddc08..3a89c6f 100644 --- a/git/dot-config/git/config +++ b/git/dot-config/git/config @@ -4,30 +4,49 @@ ci = commit s = status -sb l = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ai%C(reset) - %C(bold white)%an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)' - [pull] rebase = true - [init] defaultBranch = main - [user] name = Mohammad Reza Karimi email = m.r.karimi.j@gmail.com signingkey = 802D310CAC1F1CE6EDD55DF10A777EAC5BCAEB1B - [commit] verbose = true gpgsign = true - [tag] gpgsign = true - +[difftool "nvim_difftool"] + cmd = nvim -c \"packadd nvim.difftool\" -c \"DiffTool $LOCAL $REMOTE\" +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[difftool] + prompt = false [diff] algorithm = histogram - + tool = difftastic +[mergetool "fugitive"] + cmd = nvim -c \"Gvdiffsplit!\" \"$MERGED\" [merge] + tool = fugitive conflictstyle = zdiff3 +[grep] + lineNumber = true + column = true + patternType = extended +[pager] + difftool = true +[rerere] + enabled = true +[fetch] + prune = true [credential "https://git.overleaf.com"] helper = !pass git/overleaf@mit +[url "https://github.com/"] + insteadOf = gh: +[url "https://codeberg.org/"] + insteadOf = cb: + +# vim: ft=gitconfig |