Merge branch 'master' of git.blakenorth.net/home/git/dotfiles
This commit is contained in:
commit
55a09c7229
2 changed files with 11 additions and 5 deletions
10
.gitconfig
10
.gitconfig
|
@ -1,24 +1,28 @@
|
|||
[init]
|
||||
defaultBranch = trunk
|
||||
|
||||
[credential]
|
||||
helper = store
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
|
||||
[user]
|
||||
email = blakelysnorth@gmail.com
|
||||
name = PowerUser64
|
||||
|
||||
[alias]
|
||||
tree = 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
|
||||
lg = tree
|
||||
sub = submodule
|
||||
pl = pull
|
||||
ps = push
|
||||
s = status
|
||||
p = pull
|
||||
pu = push
|
||||
a = add
|
||||
c = commit
|
||||
ca = commit -a
|
||||
cam = commit --amend
|
||||
caam = commit -a --amend
|
||||
dh = diff HEAD
|
||||
d = diff
|
||||
|
||||
# vim:noet
|
||||
|
|
6
.zshrc
6
.zshrc
|
@ -65,8 +65,10 @@
|
|||
rmd='rmdir' \
|
||||
rd='rmdir' \
|
||||
|
||||
alias mkd=mkdir
|
||||
alias g=git
|
||||
alias \
|
||||
mkd=mkdir \
|
||||
g=git \
|
||||
sctl='sudo systemctl' \
|
||||
|
||||
# <<<
|
||||
## Program improvements (ex: ls = ls -h) >>>
|
||||
|
|
Loading…
Add table
Reference in a new issue