diff options
Diffstat (limited to 'git/dot-config')
| -rw-r--r-- | git/dot-config/git/config | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/git/dot-config/git/config b/git/dot-config/git/config index 3a89c6f..4e4c1b8 100644 --- a/git/dot-config/git/config +++ b/git/dot-config/git/config @@ -11,7 +11,7 @@ [user] name = Mohammad Reza Karimi email = m.r.karimi.j@gmail.com - signingkey = 802D310CAC1F1CE6EDD55DF10A777EAC5BCAEB1B + signingkey = 802BD02B4E3FE968B8AA2E974EC3BC726F3E7C5F [commit] verbose = true gpgsign = true @@ -22,26 +22,25 @@ [difftool "difftastic"] cmd = difft "$LOCAL" "$REMOTE" [difftool] - prompt = false + prompt = false [diff] algorithm = histogram - tool = difftastic + tool = nvim_difftool [mergetool "fugitive"] - cmd = nvim -c \"Gvdiffsplit!\" \"$MERGED\" + cmd = nvim -c \"Gvdiffsplit!\" \"$MERGED\" [merge] - tool = fugitive + tool = fugitive conflictstyle = zdiff3 [grep] lineNumber = true column = true patternType = extended [pager] - difftool = true + difftool = true [rerere] - enabled = true + enabled = true [fetch] - prune = true - + prune = true [credential "https://git.overleaf.com"] helper = !pass git/overleaf@mit [url "https://github.com/"] |