|
@@ -40,10 +40,11 @@
|
|
|
fixup = "!f() { TARGET=$(git rev-parse "$1"); git commit --fixup=$TARGET ${@:2} && EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f"
|
|
fixup = "!f() { TARGET=$(git rev-parse "$1"); git commit --fixup=$TARGET ${@:2} && EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f"
|
|
|
last = rev-list -1 HEAD
|
|
last = rev-list -1 HEAD
|
|
|
[core]
|
|
[core]
|
|
|
- excludesfile = /Users/tom/dotfiles/.gitignore_global
|
|
|
|
|
|
|
+ excludesfile = ~/.gitignore_global
|
|
|
whitespace = tab-in-indent,trailing-space,space-before-tab
|
|
whitespace = tab-in-indent,trailing-space,space-before-tab
|
|
|
ignorecase = false
|
|
ignorecase = false
|
|
|
- pager = delta
|
|
|
|
|
|
|
+ # use delta if installed, else fall back to less (don't break git without delta)
|
|
|
|
|
+ pager = command -v delta >/dev/null 2>&1 && delta || less -R
|
|
|
[push]
|
|
[push]
|
|
|
default = upstream
|
|
default = upstream
|
|
|
[status]
|
|
[status]
|
|
@@ -64,7 +65,7 @@
|
|
|
path = ~/dotfiles/.gitconfig_difftastic
|
|
path = ~/dotfiles/.gitconfig_difftastic
|
|
|
condition = command -v difft >/dev/null 2>&1
|
|
condition = command -v difft >/dev/null 2>&1
|
|
|
[interactive]
|
|
[interactive]
|
|
|
- diffFilter = delta --color-only
|
|
|
|
|
|
|
+ diffFilter = command -v delta >/dev/null 2>&1 && delta --color-only || cat
|
|
|
[delta]
|
|
[delta]
|
|
|
features = decorations
|
|
features = decorations
|
|
|
navigate = true
|
|
navigate = true
|
|
@@ -79,7 +80,7 @@
|
|
|
conflictStyle = zdiff3
|
|
conflictStyle = zdiff3
|
|
|
[credential "https://github.com"]
|
|
[credential "https://github.com"]
|
|
|
helper =
|
|
helper =
|
|
|
- helper = !/opt/homebrew/bin/gh auth git-credential
|
|
|
|
|
|
|
+ helper = !gh auth git-credential
|
|
|
[credential "https://gist.github.com"]
|
|
[credential "https://gist.github.com"]
|
|
|
helper =
|
|
helper =
|
|
|
- helper = !/opt/homebrew/bin/gh auth git-credential
|
|
|
|
|
|
|
+ helper = !gh auth git-credential
|