From f73458ec6fcb8ce359995e028ef922b888e8a87b Mon Sep 17 00:00:00 2001 From: Mitchell Riedstra Date: Wed, 8 Sep 2021 23:50:31 -0400 Subject: Formatting changes for kshrc. Update my gitconfig --- gitconfig/mitch | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gitconfig') 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 + -- cgit v1.2.3