Merge branch 'master' of git.blakenorth.net/home/git/dotfiles

This commit is contained in:
PowerUser64 2021-10-27 23:35:23 -07:00
commit 55a09c7229
2 changed files with 11 additions and 5 deletions

View file

@ -1,24 +1,28 @@
[init] [init]
defaultBranch = trunk defaultBranch = trunk
[credential] [credential]
helper = store helper = store
[pull] [pull]
rebase = false rebase = false
[user] [user]
email = blakelysnorth@gmail.com email = blakelysnorth@gmail.com
name = PowerUser64 name = PowerUser64
[alias] [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 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 lg = tree
sub = submodule sub = submodule
pl = pull
ps = push
s = status s = status
p = pull
pu = push
a = add a = add
c = commit c = commit
ca = commit -a ca = commit -a
cam = commit --amend cam = commit --amend
caam = commit -a --amend caam = commit -a --amend
dh = diff HEAD d = diff
# vim:noet # vim:noet

6
.zshrc
View file

@ -65,8 +65,10 @@
rmd='rmdir' \ rmd='rmdir' \
rd='rmdir' \ rd='rmdir' \
alias mkd=mkdir alias \
alias g=git mkd=mkdir \
g=git \
sctl='sudo systemctl' \
# <<< # <<<
## Program improvements (ex: ls = ls -h) >>> ## Program improvements (ex: ls = ls -h) >>>