As a bonus, .gitignore files.
On a Mac, run vi ~/.gitignore
.DS_StoreAs a bonus, .gitignore files.
On a Mac, run vi ~/.gitignore
.DS_StoreThese configs are from running the following commands on the respective computers.
git config --system --edit
git config --global --edit
On Mac OS X, the global config can be copied to the clipboard by running vim $HOME/.gitconfig and then :%w !pbcopy within VIM.
| [user] | |
| name = James Skemp | |
| email = [email protected] | |
| [core] | |
| excludesfile = /Users/james/.gitignore | |
| [alias] | |
| lg = !"git lg1" | |
| lg1 = !"git lg1-specific --all" | |
| lg2 = !"git lg2-specific --all" | |
| lg3 = !"git lg3-specific --all" | |
| lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' | |
| lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' | |
| lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' | |
| [merge] | |
| tool = bc3 | |
| [mergetool "bc3"] | |
| trustExitCode = true | |
| [pull] | |
| ff = only |
| [credential] | |
| helper = osxkeychain |
| [user] | |
| name = James skemp | |
| email = [email protected] | |
| [core] | |
| excludesfile = /Users/strivinglife/.gitignore | |
| [push] | |
| default = simple | |
| [difftool "sourcetree"] | |
| cmd = opendiff \"$LOCAL\" \"$REMOTE\" | |
| path = | |
| [mergetool "sourcetree"] | |
| cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | |
| trustExitCode = true |
| [credential] | |
| helper = osxkeychain |
| [filter "lfs"] | |
| clean = git-lfs clean %f | |
| smudge = git-lfs smudge %f | |
| required = true | |
| [user] | |
| name = James Skemp | |
| email = [email protected] | |
| default = simple | |
| [color "status"] | |
| untracked = cyan | |
| added = yellow | |
| changed = green | |
| [push] | |
| default = simple | |
| [credential] | |
| helper = manager | |
| [alias] | |
| lg = !"git lg1" | |
| lg1 = !"git lg1-specific --all" | |
| lg2 = !"git lg2-specific --all" | |
| lg3 = !"git lg3-specific --all" | |
| lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' | |
| lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' | |
| lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' | |
| [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\" \"$MERGED\" | |
| trustExitCode = true |
| [http] | |
| sslCAInfo = C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt | |
| [diff "astextplain"] | |
| textconv = astextplain | |
| [filter "lfs"] | |
| clean = git-lfs clean -- %f | |
| smudge = git-lfs smudge -- %f | |
| required = true | |
| process = git-lfs filter-process | |
| [credential] | |
| helper = manager |
| [user] | |
| name = James Skemp | |
| email = [email protected] | |
| [push] | |
| default = simple | |
| [filter "lfs"] | |
| clean = git-lfs clean -- %f | |
| smudge = git-lfs smudge -- %f | |
| required = true | |
| [credential] | |
| [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\" \"$MERGED\" | |
| trustExitCode = true | |
| [credential] | |
| [alias] | |
| lg = !"git lg1" | |
| lg1 = !"git lg1-specific --all" | |
| lg2 = !"git lg2-specific --all" | |
| lg3 = !"git lg3-specific --all" | |
| lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' | |
| lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' | |
| lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' | |
| [credential] | |
| helper = manager |
| [http] | |
| sslCAInfo = C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt | |
| [diff "astextplain"] | |
| textconv = astextplain | |
| [filter "lfs"] | |
| clean = git-lfs clean -- %f | |
| smudge = git-lfs smudge -- %f | |
| required = true | |
| process = git-lfs filter-process | |
| [credential] | |
| helper = manager |
| [user] | |
| name = James Skemp | |
| email = [email protected] | |
| [credential] | |
| helper = manager | |
| [alias] | |
| lg = !"git lg1" | |
| lg1 = !"git lg1-specific --all" | |
| lg2 = !"git lg2-specific --all" | |
| lg3 = !"git lg3-specific --all" | |
| lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' | |
| lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' | |
| lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' | |
| [push] | |
| default = simple | |
| [merge] | |
| tool = bc | |
| [mergetool "bc"] | |
| path = C:\\Program Files\\Beyond Compare 4\\bcomp.exe |