Skip to content

Instantly share code, notes, and snippets.

@ilyaviache
Created July 10, 2017 11:02
Show Gist options
  • Save ilyaviache/97c1a2db0f24db24e7f6b8209b16a04e to your computer and use it in GitHub Desktop.
Save ilyaviache/97c1a2db0f24db24e7f6b8209b16a04e to your computer and use it in GitHub Desktop.
[user]
name = comeonandroid
email = [email protected]
[color]
ui = auto
[alias]
st = status
ci = commit --verbose
co = checkout
di = diff
dc = diff --cached
amend = commit --amend
aa = add --all
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
fa = fetch --all
pom = push origin master
b = branch
ds = diff --stat=160,120
dh1 = diff HEAD~1
# Divergence (commits we added and commits remote added)
div = divergence
# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
# Fancy logging.
# h = head
# hp = head with patch
# r = recent commits, only current branch
# ra = recent commits, all reachable refs
# l = all commits, only current branch
# la = all commits, all reachable refs
head = !git r -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !GIT_NO_PAGER=1 git l -30
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
[core]
excludesfile = /Users/admin/.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
[commit]
template = /Users/admin/.stCommitMsg
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment