Skip to content

Instantly share code, notes, and snippets.

@fraga
Created May 10, 2011 19:03
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save fraga/965156 to your computer and use it in GitHub Desktop.
Save fraga/965156 to your computer and use it in GitHub Desktop.
.gitconfig windows machine
#usage git difftool HEAD^ HEAD or HEAD~1 HEAD~1 <filename>
[apply]
whitespace = fix
[gui]
recentrepo = C:/repo
[user]
name = Rodrigo
email = email
[diff]
tool = bc
guitool = bc
[alias]
unstage = reset HEAD
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
lol = log --pretty=oneline --abbrev-commit --graph --decorate
[difftool]
prompt = false
[core]
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
whitespace = fix,space-before-tab,tab-in-indent,trailing-space
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
tool = bc
log = true
[core]
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
whitespace = fix,space-before-tab,tab-in-indent,trailing-space
autocrlf = true
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[difftool "bc"]
cmd = /c/beyondcompare/bcomp.exe \"$LOCAL\" \"$REMOTE\"
[mergetool "bc"]
cmd = /c/beyondcompare/bcomp.exe \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" -nobackups -title1=\"Local Changes\" -title2=\"Remote Changes\" -title3=\"Committed\" trustExitCode = false
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "git@gist.github.com:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment