Skip to content

Instantly share code, notes, and snippets.

@xt0rted
Last active March 10, 2019 18:16
Show Gist options
  • Save xt0rted/922cc316324a0dba9049be5d901d46dd to your computer and use it in GitHub Desktop.
Save xt0rted/922cc316324a0dba9049be5d901d46dd to your computer and use it in GitHub Desktop.
[core]
# this actually opens in Notepad2
editor = notepad.exe
[alias]
up = !git pull --rebase --prune $@ && git submodule update --init --recursive
bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs git branch -d; }; f"
bdone = "!f() { git checkout ${1-master} && git up && git bclean ${1-master}; }; f"
shove = push origin --force
tug = pull upstream master
[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
cmd = \"c:/program files/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc4
[mergetool]
prompt = false
keepBackup = false
[mergetool "bc4"]
cmd = \"c:/program files/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[rebase]
# turns on the fixup! and squash! message prefixes
autoSquash = true
[protocol]
version = 2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment