Created
November 25, 2016 14:15
-
-
Save marsicdev/c92736e14c3503bd0291d93ce50c7fff to your computer and use it in GitHub Desktop.
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
[user] | |
name = Marko Arsic | |
email = ADD_EMAIL_HERE | |
[alias] | |
A = add -A | |
a = add | |
aa = add --all | |
ae = add --edit | |
ai = add --interactive | |
amend = commit --amend -C HEAD | |
ap = add --patch | |
au = add --update | |
authors = "!git log --pretty=format:%aN | sort | uniq -c | sort -rn" | |
b = branch | |
c = commit | |
ca = commit --amend | |
cam = commit -am | |
changes = diff --name-status -r | |
cm = commit --message | |
co = checkout | |
cpc = cherry-pick | |
d = diff | |
dc = diff --cached | |
div = divergence | |
ds = diff --staged | |
fu = fetch upstream | |
mud = merge upstream/develop | |
h = help | |
irb = rebase --interactive | |
l = log --oneline --decorate | |
lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative | |
ls-ignored = ls-files --exclude-standard --ignored --others | |
m = merge | |
mm = merge --no-ff | |
msg = commit --allow-empty -m | |
p = cherry-pick -s | |
pick = cherry-pick | |
pom = push origin master | |
pofm = push origin HEAD:refs/for/master | |
pofd = push origin HEAD:refs/for/develop | |
pod = push origin develop | |
prune-remotes = "!for remote in `git remote`; do git remote prune $remote; done" | |
push = push --tags | |
r = remote | |
ra = !git log --graph --abbrev-commit --date=relative -20 --all --pretty='format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' | |
rb = rebase | |
rba = rebase --abort | |
rbc = rebase --continue | |
rbs = rebase --skip | |
rh = reset --hard | |
ru = remote update --prune | |
s = status --short --branch | |
sl = shortlog | |
sm = submodule | |
sma = submodule add | |
smu = submodule update --init | |
#st = stash | |
stl = stash list | |
stp = stash pop | |
tagcommit = !sh -c 'git rev-list $0 | head -n 1' | |
tree = log --graph --pretty=oneline --decorate | |
undo = reset --soft HEAD^ | |
wd = diff --color-words | |
wds = diff --color-words --staged | |
[color] | |
branch = auto | |
diff = auto | |
status = auto | |
interactive = auto | |
ui = true | |
pager = true | |
[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 | |
[help] | |
autocorrect = 0 | |
[apply] | |
whitespace = nowarn | |
[core] | |
excludesfile = /Users/marsic/.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 | |
[filter "lfs"] | |
clean = git-lfs clean %f | |
smudge = git-lfs smudge %f | |
required = true | |
[push] | |
default = simple |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment