54 lines
1.5 KiB
Text
54 lines
1.5 KiB
Text
[user]
|
|
name = Matthew Dillon
|
|
email = matthewrdillon@gmail.com
|
|
[core]
|
|
editor = vim
|
|
excludesfile = /Users/matthew/.gitignore_global
|
|
[color]
|
|
diff = auto
|
|
status = auto
|
|
branch = auto
|
|
interactive = auto
|
|
ui = auto
|
|
[gc]
|
|
auto = 1
|
|
[merge]
|
|
summary = true
|
|
tool = vimdiff
|
|
conflictstyle = diff3
|
|
prompt = false
|
|
[alias]
|
|
unstage = reset HEAD
|
|
uncommit = reset --soft HEAD^
|
|
# http://stackoverflow.com/a/9074343
|
|
lg1 = log \
|
|
--graph \
|
|
--abbrev-commit \
|
|
--decorate \
|
|
--format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' \
|
|
--all
|
|
lg2 = log \
|
|
--graph \
|
|
--abbrev-commit \
|
|
--decorate \
|
|
--format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' \
|
|
--all
|
|
lg = !"git lg1"
|
|
# https://gist.github.com/mwhite/6887990
|
|
a = add
|
|
c = commit --verbose
|
|
ca = commit -a --verbose
|
|
m = commit --amend --verbose
|
|
d = diff
|
|
dc = diff --cached
|
|
s = status -s
|
|
co = checkout
|
|
cob = checkout -b
|
|
# list branches sorted by last modified
|
|
b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'"
|
|
# list aliases
|
|
la = "!git config -l | grep alias | cut -c 7-"
|
|
[push]
|
|
default = upstream
|
|
[pull]
|
|
rebase = true
|