Merge remote-tracking branch 'origin/master'

This commit is contained in:
thek4n 2025-02-01 14:58:47 +03:00
commit 570db7724c
3 changed files with 8 additions and 11 deletions

View File

@ -24,6 +24,7 @@
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)" ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)" pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
pr = "pull --rebase" pr = "pull --rebase"
s = status
st = status st = status
br = branch br = branch
bm = branch --merged bm = branch --merged

View File

@ -76,16 +76,12 @@ alias vi='nvim'
alias svi="sudo --preserve-env nvim" alias svi="sudo --preserve-env nvim"
# git # git
alias gs="git status" for al in s d di co col ds a u ps pl hs last lastd df amend br
alias gd="git diff" do
alias gds="git diff --staged" alias "g${al}"="git ${al}"
alias ga="git a" done
alias gcim="noglob git cim" alias gcim="noglob git cim"
alias gps="git ps"
alias ghs="git hs"
alias glast="git last"
alias glastd="git lastd"
alias gdf="git df"
# net # net
alias ports='ss -tlnp' alias ports='ss -tlnp'