Skip to content

Instantly share code, notes, and snippets.

@Wizek
Created May 25, 2011 19:59
Show Gist options
  • Save Wizek/991790 to your computer and use it in GitHub Desktop.
Save Wizek/991790 to your computer and use it in GitHub Desktop.
[core]
symlinks = false
autocrlf = true
[pack]
packSizeLimit = 2g
[help]
format = html
[http]
sslCAinfo = /bin/curl-ca-bundle.crt
[sendemail]
smtpserver = /bin/msmtp.exe
[color]
diff = auto
status = auto
branch = auto
interactive = true
[color "interactive"]
prompt = cyan
[alias]
co = checkout
ci = commit
st = status
br = branch
dt = difftool
da = diffall
hist = log \
--pretty=format:'%Creset%h %C(cyan)%ad%Creset %s%Cgreen%d %C(yellow)[%an]' \
--graph \
--date=short \
--since='1 month'
type = cat-file -t
dump = cat-file -p
[diff]
tool = bc3
[difftool]
prompt = false
[difftool "bc3"]
cmd = 'I:/Apps/Beyond Compare 3/BComp.exe' "$LOCAL" "$REMOTE"
prompt = false
[diff "astextplain"]
textconv = astextplain
[merge]
tool
[mergetool "bc3"]
cmd = 'I:/Apps/Beyond Compare 3/BComp.exe' \
"\"$PWD/$LOCAL\"" \
"\"$PWD/$REMOTE\"" \
"\"$PWD/$BASE\"" \
"\"$PWD/$MERGED\""
keepBackup = false
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment