diff --git a/.zshrc b/.zshrc index b0b64eb..892430d 100644 --- a/.zshrc +++ b/.zshrc @@ -96,12 +96,7 @@ alias ansible-galaxy-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" ansible-g alias ssh-work="ssh -i ~/.ssh/work/id_rsa" alias rsyncwork="rsync -h --progress -e 'ssh -i ~/.ssh/work/id_rsa'" alias git-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" git' -alias gwork=git-work -alias gitwork=gwork -alias gcommitw="git commit --author='Marcin Woźniak '" -alias git-commit-work=gcommitw -alias gitcommitwork=gcommitw -alias gitworkcommit=gcommitw +alias git-commit-work="git commit --author='Marcin Woźniak '" # Alias ssh alias ssh-restore="cp -rv ~/ssh-mega/config ~/.ssh/ ; ssh-permissions" @@ -210,27 +205,6 @@ alias dplen="trans pl:en" alias myip="curl ipinfo.io/ip" alias changefont="figlet" -# Git -alias git-exclude="git update-index --assume-unchanged" -alias gexclude=git-exclude -alias gmaster="git checkout master; git checkout main" -alias gmain="git checkout master; git checkout main" -alias gcommit="git commit --author='Marcin Woźniak ' -s" -alias gdel="git push origin --delete" -alias gadd="git add" -alias gpush="git push" -alias gpull="git fetch -p -q; git pull; git submodule foreach git pull origin master -q; git submodule foreach git pull origin main -q; git submodule status" -alias gpu="git fetch -p -q; git pull; git submodule foreach git pull origin master -q; git submodule foreach git pull origin main -q; git submodule status" -alias gch="git checkout" -alias gst="git status -s" -alias gdiff="git --no-pager diff" -alias glog="git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an - %ae>%Creset' --abbrev-commit --branches" -alias git-show="git --no-pager show --color --pretty=format:%b" -alias gshow=git-show -alias gd=git-show -alias git-untrack-file="git update-index --assume-unchanged" -alias guntrackfile=git-untrack-file - # Others alias channel-check='sudo iwlist wlan0 scan | egrep -i "essid|frequency"' alias newswork="newsboat --url=$HOME/.config/newsboat/urlswork"