Last active
January 19, 2020 15:48
-
-
Save theorm/4c13df433c6d0516fb62391f30a5ad6f 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] | |
| email = [email protected] | |
| [alias] | |
| # View the SHA, description, and history graph of the latest 20 commits | |
| l = log --pretty=oneline -n 20 --graph | |
| lg = log -p | |
| lol = log --graph --decorate --pretty=oneline --abbrev-commit | |
| lola = log --graph --decorate --pretty=oneline --abbrev-commit --all | |
| ls = ls-files | |
| # View the current working tree status using the short format | |
| st = status -s | |
| # Show the diff between the latest commit and the current state | |
| df = !"git diff-index --quiet HEAD -- || clear; git diff --patch-with-stat" | |
| # `git di $number` shows the diff between the state `$number` revisions ago and the current state | |
| di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" | |
| # Pull in remote changes for the current repository and all its submodules | |
| p = !"git pull; git submodule foreach git pull origin master" | |
| # Clone a repository including all submodules | |
| c = clone --recursive | |
| # Commit all changes | |
| ca = !git add -A && git commit -av | |
| ci = commit | |
| # Switch to a branch, creating it if necessary | |
| go = checkout -B | |
| co = checkout | |
| # Show verbose output about tags, branches or remotes | |
| tags = tag -l | |
| branches = branch -a | |
| remotes = remote -v | |
| # Credit an author on the latest commit | |
| credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" | |
| # Interactive rebase with the given number of latest commits | |
| reb = "!r() { git rebase -i HEAD~$1; }; r" | |
| # Undo a `git push` | |
| undopush = push -f origin HEAD^:master | |
| # Show files ignored by git: | |
| ign = ls-files -o -i --exclude-standard | |
| # Remove local branches that have been merged into master | |
| cleanup = !sh -c 'git branch --merged | grep -v \\* | xargs -n 1 git branch -d' | |
| [apply] | |
| # Detect whitespace errors when applying a patch | |
| whitespace = fix | |
| [core] | |
| # Use custom `.gitignore` and `.gitattributes` | |
| excludesfile = ~/.gitignore | |
| attributesfile = ~/.gitattributes | |
| # Treat spaces before tabs, lines that are indented with 8 or more spaces, and all kinds of trailing whitespace as an error | |
| whitespace = space-before-tab,indent-with-non-tab,trailing-space | |
| [color] | |
| # Use colors in Git commands that are capable of colored output when outputting to the terminal | |
| 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] | |
| # Include summaries of merged commits in newly created merge commit messages | |
| log = true | |
| [mergetool "sourcetree"] | |
| cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | |
| trustExitCode = true | |
| # Use `origin` as the default remote on the `master` branch in all cases | |
| [branch "master"] | |
| remote = origin | |
| merge = refs/heads/master | |
| # URL shorthands | |
| [url "[email protected]:"] | |
| insteadOf = "gh:" | |
| pushInsteadOf = "github:" | |
| pushInsteadOf = "git://github.com/" | |
| [url "git://github.com/"] | |
| insteadOf = "github:" | |
| [url "[email protected]:"] | |
| insteadOf = "gst:" | |
| pushInsteadOf = "gist:" | |
| pushInsteadOf = "git://gist.github.com/" | |
| [url "git://gist.github.com/"] | |
| insteadOf = "gist:" | |
| [difftool "sourcetree"] | |
| cmd = opendiff \"$LOCAL\" \"$REMOTE\" | |
| path = | |
| [filter "media"] | |
| clean = git media clean %f | |
| smudge = git media smudge %f | |
| required = true | |
| [filter "lfs"] | |
| required = true | |
| clean = git-lfs clean %f | |
| smudge = git-lfs smudge %f |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment