Created
April 19, 2015 10:17
-
-
Save vdemeester/bd17bdd2e87b87efb106 to your computer and use it in GitHub Desktop.
.gitconfig
This file contains 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
[alias] | |
co = checkout | |
st = status | |
ci = commit | |
civ = commit -v | |
wdiff = diff --color-words | |
cim = !"command -v mvn >/dev/null && test -f ./pom.xml && mvn clean test && git commit" | |
br = branch | |
unstage = reset HEAD | |
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative | |
lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --branches --remotes | |
lol = log --pretty=oneline --abbrev-commit --graph --decorate | |
conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR | |
resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add | |
# submodule aliases | |
# git diff on each submodule | |
subdiff = !"git submodule foreach --recursive --quiet '[ \"$(git status -s)\" ] && echo \"--- $name ---\" && git status -s && git diff --unified=1 || :'" | |
# on which branch is the submodule | |
subbranch = !"git submodule foreach --recursive 'git rev-parse --abbrev-ref HEAD'" | |
# Search for a given string in all patches and print commit messages | |
# example: search for any commit that adds or removes string "foobar" | |
# git searchcommits foobar | |
# example: search commits for string "foobar" in directory src/lib | |
# git searchcommits foobar src/lib | |
# example: search commits for "foobar", print full diff of commit with 1 line context | |
# git searchcommits foobar --pickaxe-all -U1 src/lib | |
searchcommits = "!f() { query=\"$1\"; shift; git log -S\"$query\" \"$@\"; }; f \"$@\"" | |
root = rev-parse --show-toplevel | |
[color] | |
branch = auto | |
diff = auto | |
status = auto | |
[color "branch"] | |
current = white reverse | |
local = white | |
remote = green | |
[color "diff"] | |
meta = white | |
frag = magenta reverse | |
old = red | |
new = green | |
[color "status"] | |
added = green | |
changed = yellow | |
untracked = red | |
[core] | |
editor = subl | |
[push] | |
default = matching |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment