Last active
December 15, 2016 23:48
-
-
Save ryanschuhler/fa7e80ad4660481bce5fb076d7f85b0e to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [user] | |
| name = ryanschuhler | |
| email = [email protected] | |
| [credential] | |
| helper = cache --timeout=7200 | |
| [alias] | |
| co = checkout | |
| cb = checkout -b | |
| br = branch | |
| st = status | |
| po = push origin | |
| u = !git fetch upstream && git pull --rebase upstream $1 | |
| ux = !git co ee-6.2.x && git fetch upstream ee-6.2.x && git pull --rebase upstream ee-6.2.x && git push origin ee-6.2.x | |
| ux1 = !git co ee-6.1.x && git fetch upstream ee-6.1.x && git pull --rebase upstream ee-6.1.x && git push origin ee-6.1.x | |
| btex = !git branch --track $1 upstream/ee-6.1.x && git checkout | |
| pru = pull --rebase upstream | |
| fu = fetch upstream | |
| cos = git checkout $1 && git status | |
| lg = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative | |
| sfm = "!f() { git diff --stat --name-only ee-6.2.x.. | grep -E '.(jsp.?|vm|ftl|tag|tpl|tmpl|js|soy|hbs|(s)?css)$' | tr \"\\n\" \"\\0\" | xargs -0 -J{} check_sf {} $@; }; f" | |
| [github] | |
| user = ryanschuhler | |
| oauth-token = xxxxxxxxxx | |
| [core] | |
| excludesfile = /Users/ryan/.gitignore_global | |
| autocrlf = input | |
| [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 | |
| [filter "lfs"] | |
| clean = git-lfs clean %f | |
| smudge = git-lfs smudge %f | |
| required = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment