From 2be10fa0c817b855534c2b351847f127c16b836f Mon Sep 17 00:00:00 2001 From: Yigit Sever Date: Tue, 5 Apr 2022 02:11:25 +0300 Subject: git: remove diff-so-fancy, bring difftastic in --- .gitconfig##h.maus | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to '.gitconfig##h.maus') diff --git a/.gitconfig##h.maus b/.gitconfig##h.maus index 265ecb6..75f6615 100644 --- a/.gitconfig##h.maus +++ b/.gitconfig##h.maus @@ -5,7 +5,6 @@ [core] autocrlf = input safecrlf = true - pager = diff-so-fancy | less --tabs=4 -RFX excludesfile = ~/.cvsignore [alias] co = checkout @@ -19,6 +18,7 @@ sl = log --oneline --decorate -20 sla = log --oneline --decorate --graph --all -20 branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes + dft = difftool [credential] helper = cache --timeout=3600 [color] @@ -45,3 +45,11 @@ ff = only [init] defaultBranch = main +[diff] + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[pager] + difftool = true -- cgit v1.2.3-70-g09d2