diff options
| author | Mitchell Riedstra <mitch@riedstra.dev> | 2021-09-08 23:50:31 -0400 |
|---|---|---|
| committer | Mitchell Riedstra <mitch@riedstra.dev> | 2021-09-08 23:50:31 -0400 |
| commit | f73458ec6fcb8ce359995e028ef922b888e8a87b (patch) | |
| tree | aa237d10eebea9fe5aa6e2b9180ccad17e68e71f /gitconfig | |
| parent | b07669d3c5436f31f83a3796eb3286eb43aae0a7 (diff) | |
| download | dotfiles-f73458ec6fcb8ce359995e028ef922b888e8a87b.tar.gz dotfiles-f73458ec6fcb8ce359995e028ef922b888e8a87b.tar.xz | |
Formatting changes for kshrc. Update my gitconfig
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig/mitch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gitconfig/mitch b/gitconfig/mitch index 14ad151..8c525cf 100644 --- a/gitconfig/mitch +++ b/gitconfig/mitch @@ -7,5 +7,16 @@ [alias] hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short histv = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short --stat + dt = difftool + mt = mergetool [pull] ff = only +[diff] + tool = vimdiff +[difftool] + prompt = false +[mergetool] + prompt = false +[merge] + tool = vimdiff + |