Skip to content

Instantly share code, notes, and snippets.

@kogakure
Created December 9, 2008 17:25
Show Gist options
  • Save kogakure/33983 to your computer and use it in GitHub Desktop.
Save kogakure/33983 to your computer and use it in GitHub Desktop.
Git: .gitconfig, .gitignore, .gitk
[user]
name = John Doe
email = john.doe@gmail.com
[core]
excludesfile = /Users/doe/.gitignore
[color]
status = auto
diff = auto
branch = auto
interacitve = auto
[alias]
st = status
ci = commit
co = checkout
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge \
"$PWD/$BASE" \
"$PWD/$REMOTE" \
"$PWD/$LOCAL" \
"$PWD/$MERGED"
keepBackup = false
trustExitCode = false
[mergetool "diffmerge"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge \
--nosplash \
--result="$PWD/$MERGED" \
"$PWD/$BASE" \
"$PWD/$REMOTE" \
"$PWD/$LOCAL"
keepBackup = false
trustExitCode = false
[gui]
fontui = -family \"Lucida Grande\" -size 11 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family Monaco -size 11 -weight normal -slant roman -underline 0 -overstrike 0
.DS_Store
*.pyc
*.pyo
*~
*.swp
*.orig
.project
.pydevproject
MANIFEST
dist
*.todo
Icon*
.BridgeSort
set mainfont {Monaco 10}
set textfont {Monaco 10}
set uifont {Monaco 10}
set tabstop 8
set findmergefiles 0
set maxgraphpct 50
set maxwidth 16
set cmitmode patch
set wrapcomment none
set autoselect 1
set showneartags 1
set showlocalchanges 1
set datetimeformat {%Y-%m-%d %H:%M:%S}
set limitdiffs 1
set bgcolor white
set fgcolor black
set colors {green red blue magenta darkgrey brown orange}
set diffcolors {red "#00a000" blue}
set diffcontext 3
set selectbgcolor gray85
set extdifftool meld
set geometry(main) 1039x669+5+45
set geometry(topwidth) 1035
set geometry(topheight) 195
set geometry(pwsash0) "303 2"
set geometry(pwsash1) "455 2"
set geometry(botwidth) 379
set geometry(botheight) 454
set permviews {}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment