|
@@ -18,10 +18,6 @@
|
|
ui = true
|
|
ui = true
|
|
[diff]
|
|
[diff]
|
|
algorithm = histogram
|
|
algorithm = histogram
|
|
-[difftool]
|
|
|
|
- prompt = false
|
|
|
|
-[difftool "difft"]
|
|
|
|
- cmd = difft "$LOCAL" "$REMOTE"
|
|
|
|
[push]
|
|
[push]
|
|
default = current
|
|
default = current
|
|
[branch]
|
|
[branch]
|
|
@@ -56,6 +52,9 @@
|
|
reset-head = remote set-head origin -a
|
|
reset-head = remote set-head origin -a
|
|
head = for-each-ref --format="%(symref:lstrip=-1)" refs/remotes/origin/HEAD
|
|
head = for-each-ref --format="%(symref:lstrip=-1)" refs/remotes/origin/HEAD
|
|
sh = "!git switch $(git head)"
|
|
sh = "!git switch $(git head)"
|
|
|
|
+ # show/diff but with difftastic
|
|
|
|
+ dshow = -c diff.external=difft show --ext-diff
|
|
|
|
+ ddiff = -c diff.external=difft diff
|
|
|
|
|
|
[include]
|
|
[include]
|
|
path = ./config.local
|
|
path = ./config.local
|