diff options
Diffstat (limited to 'files/.gitconfig')
| -rw-r--r-- | files/.gitconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index 3b3ca6a..4bffd82 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -24,6 +24,8 @@ colorMoved = true [difftool] prompt = false +[difftool "difftastic"] + cmd = difft --background=light --color=always "$LOCAL" "$REMOTE" [diff-so-fancy] stripLeadingSymbols = false markEmptyLines = false @@ -52,6 +54,9 @@ diffstat = diff --stat -r dc = diff --find-copies-harder --cached di = diff --find-copies-harder + dft = difftool --tool=difftastic + dshow = "!f() { GIT_EXTERNAL_DIFF=difft git show --ext-diff $@; }; f" + dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff $@; }; f" fix = commit --amend -C HEAD history-all = "!gitk --all $( git fsck | awk '/dangling commit/ {print $3}'; git log -g --pretty='format:%H')" k = !sh -c 'gitk $1' - |