Created
May 6, 2020 16:08
-
-
Save sneeu/521bcf6194d2360198dbe57385c38bc4 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
amend = commit --amend | |
cane = commit --amend --no-edit | |
br = branch | |
brd = !git diff `git merge-base HEAD master` | |
brdt = !git difftool `git merge-base HEAD master` | |
brl = !git branch --sort=-committerdate | head -n 5 | |
ci = commit | |
co = checkout | |
di = diff | |
dt = difftool | |
dth = difftool HEAD | |
lg = log --graph --decorate --color --all --format=format:\"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%cn>%Creset\" | |
st = status -s | |
type = cat-file -t | |
dump = cat-file -p | |
size = diff --numstat | |
[core] | |
excludesfile = ~/.gitignore | |
quotepath = false | |
editor = nvim | |
[difftool "Kaleidoscope"] | |
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | |
[diff] | |
tool = Kaleidoscope | |
compactionHeuristic = true | |
algorithm = patience | |
[difftool] | |
prompt = false | |
[mergetool "Kaleidoscope"] | |
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
trustExitCode = true | |
[mergetool] | |
prompt = false | |
[merge] | |
tool = Kaleidoscope | |
ff = false | |
conflictstyle = diff3 | |
[pull] | |
ff = only | |
[commit] | |
gpgsign = true | |
[status] | |
showUntrackedFiles = all | |
[push] | |
default = current |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment