Last active
October 21, 2016 09:35
-
-
Save blattmann/f2531d496bcb793032c12222775f70fc 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
[core] | |
excludesfile = /Users/sblat1/.gitignore_global | |
[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 | |
[user] | |
name = NAME LASTNAME | |
email = [email protected] | |
[color] | |
ui = true | |
[core] | |
autocrlf = input | |
whitespace = trailing-space,space-before-tab,indent-with-non-tab | |
[push] | |
default = simple | |
[url "https://"] | |
insteadOf = git:// | |
[Alias] | |
st = status | |
ci = commit | |
cl = clone | |
br = branch | |
co = checkout | |
df = diff | |
dc = diff --cached | |
#resets | |
rh = reset --hard | |
discard = reset HEAD --hard | |
#others | |
who = shortlog -s -- | |
forkdiff = !bash -c 'git diff $(git merge-base "$1" "$2") "$2" "${@: 3}" ' - | |
untrack = rm --cache -- | |
#list aliases | |
new = !sh -c 'git log $1@{1}..$1@{0} "$@" | |
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative | |
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat | |
fl = log -u | |
lg-full = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --pretty=full --name-status | |
conflicted = ls-files -u | |
la = "!git config -l | grep alias | cut -c 7-" | |
ls-ignored = !git ls-files -v | grep ^[a-z] | |
#Self made | |
ignore = update-index --assume-unchanged | |
unignore = update-index --no-assume-unchanged | |
mmnff = merge --no-ff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Thanks to @DanielaValero for this gist!