Skip to content

Instantly share code, notes, and snippets.

@ghorsey
Last active November 13, 2019 05:07
Show Gist options
  • Save ghorsey/372f89f5bb5f50123693ed55337fbb2a to your computer and use it in GitHub Desktop.
Save ghorsey/372f89f5bb5f50123693ed55337fbb2a to your computer and use it in GitHub Desktop.
My current .gitconfig
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
co = commit
m = merge
ch = checkout
pl = pull
pu = push
ffs = flow feature start
fff = flow feature finish
fbs = flow bugfix start
fbf = flow bugfix finish
s = status
a = add
[pull]
rebase = true
[difftool "sourcetree"]
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" -o \"$MERGED\"
trustExitCode = true
[diff]
tool = bc4
[difftool "bc4"]
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = bc4
[mergetool "bc4"]
cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment