add prettier log, and prettier diff

This commit is contained in:
Tyrel Souza 2016-04-07 14:04:31 -04:00
parent e4d97b546a
commit 9cb66b3185
No known key found for this signature in database
GPG Key ID: 2EECB5087209E6A5
2 changed files with 8 additions and 0 deletions

View File

@ -6,6 +6,9 @@
signingkey = 8A2DDEE2 signingkey = 8A2DDEE2
[commit] [commit]
gpgsign = true gpgsign = true
[color]
ui = auto # covers diff = true, status = auto, branch = auto
interactive = auto
[push] [push]
default = simple default = simple
[format] [format]
@ -13,6 +16,8 @@
[alias] [alias]
# show all these aliases # show all these aliases
alias = "!git config -l | grep alias | cut -c 7-" alias = "!git config -l | grep alias | cut -c 7-"
# Way more information on git log
ll = log --stat --abbrev-commit
# Show files modified per commit # Show files modified per commit
files = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat files = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
# show a tree with branches merging # show a tree with branches merging
@ -25,6 +30,8 @@
v=describe --tags --match 'v*' v=describe --tags --match 'v*'
# alias like `hg st`, because I like st, shorter is nice! # alias like `hg st`, because I like st, shorter is nice!
st = status st = status
# prettier diffs
d = diff --color-words
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean %f clean = git-lfs clean %f
smudge = git-lfs smudge %f smudge = git-lfs smudge %f

1
zshrc
View File

@ -39,6 +39,7 @@ source ~/.bash_aliases
alias cg='cd "$(git rev-parse --show-toplevel)"' alias cg='cd "$(git rev-parse --show-toplevel)"'
alias fuck='eval $(thefuck $(fc -ln -1)); history -r' alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
alias ag='\ag --pager="less"' alias ag='\ag --pager="less"'
alias g='git'
if [ -e ~/.ssh/id_rsa ];then if [ -e ~/.ssh/id_rsa ];then
ssh-add ~/.ssh/id_addgene ssh-add ~/.ssh/id_addgene