Skip to content

Instantly share code, notes, and snippets.

@bforrest
Created May 12, 2011 16:35
Show Gist options
  • Select an option

  • Save bforrest/968889 to your computer and use it in GitHub Desktop.

Select an option

Save bforrest/968889 to your computer and use it in GitHub Desktop.
git config
[core]
autocrlf = false
safecrlf = true
[user]
name = Barry Forrest
email = [email protected]
[alias]
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
last = log -1 HEAD
#push
pom = push origin master
[merge]
summary = true
tool = "bc3"
[mergetool]
prompt=false
[mergetool "bc3"]
cmd = \"C:/Tools/Beyond Compare 3/bcomp.exe\" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" "$MERGED"
[diff]
tool = "bc3"
[difftool "bc3"]
cmd = \"C:/Tools/Beyond Compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[achievement]
upload = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment