summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitconfig##h.maus10
1 files changed, 9 insertions, 1 deletions
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 @@
5[core] 5[core]
6 autocrlf = input 6 autocrlf = input
7 safecrlf = true 7 safecrlf = true
8 pager = diff-so-fancy | less --tabs=4 -RFX
9 excludesfile = ~/.cvsignore 8 excludesfile = ~/.cvsignore
10[alias] 9[alias]
11 co = checkout 10 co = checkout
@@ -19,6 +18,7 @@
19 sl = log --oneline --decorate -20 18 sl = log --oneline --decorate -20
20 sla = log --oneline --decorate --graph --all -20 19 sla = log --oneline --decorate --graph --all -20
21 branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes 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
21 dft = difftool
22[credential] 22[credential]
23 helper = cache --timeout=3600 23 helper = cache --timeout=3600
24[color] 24[color]
@@ -45,3 +45,11 @@
45 ff = only 45 ff = only
46[init] 46[init]
47 defaultBranch = main 47 defaultBranch = main
48[diff]
49 tool = difftastic
50[difftool]
51 prompt = false
52[difftool "difftastic"]
53 cmd = difft "$LOCAL" "$REMOTE"
54[pager]
55 difftool = true