2015-12-12 21:45:03 +00:00
|
|
|
[core]
|
|
|
|
|
excludesfile = ~/.gitignore_global
|
2016-06-28 02:22:35 +00:00
|
|
|
[include]
|
|
|
|
|
path = ~/.git_user
|
2015-08-08 20:45:40 +00:00
|
|
|
[master]
|
2015-11-24 18:04:50 +00:00
|
|
|
autosetuprebase = always
|
2015-08-08 20:45:40 +00:00
|
|
|
[color]
|
2015-11-24 18:04:50 +00:00
|
|
|
ui = auto
|
|
|
|
|
[push]
|
|
|
|
|
default = current
|
2016-09-28 14:29:54 +00:00
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
conflictstyle = diff3
|
2016-04-12 23:12:17 +00:00
|
|
|
[alias]
|
|
|
|
|
# Basics
|
|
|
|
|
st = status -s
|
|
|
|
|
cl = clone
|
|
|
|
|
cm = commit -m
|
|
|
|
|
cma = commit -am
|
|
|
|
|
ck = checkout
|
|
|
|
|
br = branch
|
|
|
|
|
gr = grep -I
|
|
|
|
|
|
|
|
|
|
# Tweak defaults
|
|
|
|
|
bra = branch -ra
|
|
|
|
|
|
|
|
|
|
# List aliases
|
|
|
|
|
la = "!git config -l | grep alias | cut -c 7-"
|
|
|
|
|
|
|
|
|
|
# Pretty branch graph
|
|
|
|
|
lg = log --oneline --abbrev-commit --all --graph --decorate --color
|
2018-05-17 17:28:27 +00:00
|
|
|
# Graph with additional info (author, date)
|
|
|
|
|
lga = log --graph --abbrev-commit --decorate --format=format:'%C(yellow)%h%C(reset) %C(bold red)%d%C(reset) %C(blue)[%an]%C(reset) %C(green)(%ar)%C(reset) - %C(white)%s%C(reset)' --all
|
2017-10-19 05:07:57 +00:00
|
|
|
# Same but also list modified files
|
|
|
|
|
lf = log --oneline --name-status --all --graph --decorate --color
|
2018-05-17 17:28:27 +00:00
|
|
|
|
|
|
|
|
# pull rebase
|
|
|
|
|
prb = pull --rebase
|
