Created
April 6, 2017 14:04
-
-
Save jelder/ce4344696139c36786ea08e860b1cf6f to your computer and use it in GitHub Desktop.
Jacob Elder's .gitconfig
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 = Jacob Elder | |
email = [email protected] | |
[status] | |
submodulesummary = false | |
# https://gist.github.com/jelder/ce4344696139c36786ea08e860b1cf6f | |
[alias] | |
out = "log @{u}.." | |
fetchall = !git pull && git submodule update --init --remote --recursive && git submodule foreach -q --recursive 'echo Updating $name && git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master) && git -C $toplevel/$name pull && echo ---' | |
branchall = "submodule foreach git rev-parse --abbrev-ref HEAD" | |
branchprune = "! git fetch --prune origin && dead=$(git branch --merged | grep -v master) && git branch -D ${dead}" | |
# https://github.com/zorgiepoo/Komet | |
[core] | |
editor = /Applications/Komet.app/Contents/MacOS/Komet | |
# https://blog.scottnonnenberg.com/better-git-configuration/ | |
[alias] | |
undo = reset --soft HEAD^ | |
stash-all = stash save --include-untracked | |
[push] | |
default = simple | |
[merge] | |
ff = only | |
conflictstyle = diff3 | |
[status] | |
showUntrackedFiles = all | |
# https://news.ycombinator.com/item?id=14045787 | |
[stash] | |
showPatch = true | |
[rebase] | |
autostash = true | |
[log] | |
decorate = full | |
[alias] | |
original = !git show $(cat .git/rebase-apply/original-commit) | |
[color "status"] | |
added = green | |
changed = yellow bold | |
untracked = red bold | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
TODO: Add this: https://github.com/so-fancy/diff-so-fancy