Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e37fc66a9c | |||
| 5c7682c464 |
@@ -93,6 +93,7 @@ alias glg='git log --graph --decorate'
|
||||
alias glgs='git log --stat --graph --decorate'
|
||||
alias glgso='git log --oneline --stat --graph --decorate'
|
||||
alias glog='git log --oneline --graph --decorate'
|
||||
alias glogf="git log --pretty=format:'%C(bold yellow)%h%Creset %Cgreen%ad%Creset %C(white)|%Creset %C(bold white)%s%Creset%C(auto)%d%Creset [%Cblue%an%Creset]' --graph --date=short"
|
||||
alias gm='git merge'
|
||||
alias gmv='git mv'
|
||||
alias gma='git merge --abort'
|
||||
@@ -149,6 +150,7 @@ alias ylg='yadm log --graph --decorate'
|
||||
alias ylgs='yadm log --stat --graph --decorate'
|
||||
alias ylgso='yadm log --oneline --stat --graph --decorate'
|
||||
alias ylog='yadm log --oneline --graph --decorate'
|
||||
alias ylogf="yadm log --pretty=format:'%C(bold yellow)%h%Creset %Cgreen%ad%Creset %C(white)|%Creset %C(bold white)%s%Creset%C(auto)%d%Creset [%Cblue%an%Creset]' --graph --date=short"
|
||||
alias ym='yadm merge'
|
||||
alias ymv='yadm mv'
|
||||
alias yma='yadm merge --abort'
|
||||
|
||||
@@ -21,3 +21,12 @@
|
||||
|
||||
[diff]
|
||||
colorMoved = default
|
||||
|
||||
[alias]
|
||||
co = checkout
|
||||
ci = commit
|
||||
st = status
|
||||
br = branch
|
||||
hist = log --pretty=format:'%C(bold yellow)%h%Creset %Cgreen%ad%Creset %C(white)|%Creset %C(bold white)%s%Creset%C(auto)%d%Creset [%Cblue%an%Creset]' --graph --date=short
|
||||
type = cat-file -t
|
||||
dump = cat-file -p
|
||||
@@ -20,6 +20,12 @@ if [ -d "$HOME/.bin" ]; then
|
||||
export PATH="$HOME/.bin:$PATH"
|
||||
fi
|
||||
|
||||
if [ -d "$HOME/.nvm" ]; then
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" # This loads nvm
|
||||
[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
|
||||
fi
|
||||
|
||||
fpath=("$HOME/.zsh/zsh-completions/src" $fpath)
|
||||
|
||||
# Editor
|
||||
|
||||
Reference in New Issue
Block a user