diff options
Diffstat (limited to 'files/.gitconfig')
| -rw-r--r-- | files/.gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index a883cda..462e97c 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -51,6 +51,8 @@ wc = whatchanged -p --abbrev-commit --pretty=medium undo = reset --soft HEAD~ whoami = config user.email + fugitive = mergetool --tool fugitive + clean-branches = !sh -c 'git branch --merged | grep -v '^*' | fzf -m | xargs -rp git branch -d' [advice] statusHints = false detachedHead = false @@ -93,3 +95,5 @@ clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process +[mergetool "fugitive"] + cmd = vim -c \"Gdiff\" \"$MERGED\" |