joshtronic/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a new git merge alias

Browse source
This commit is contained in:
Josh Sherman 2024-06-26 11:25:46 -05:00
parent db9d9628e5
commit ce13923d34
No known key found for this signature in database
GPG key ID: 55B058A80530EF22
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zsh/.aliases
View file

@ -80,6 +80,7 @@ alias gl='git pull origin $(git_current_branch)'
alias glg='git log' alias glg='git log'
alias gm='git merge' alias gm='git merge'
alias gmm='git merge $(git_default_branch)' alias gmm='git merge $(git_default_branch)'
alias gmt='git merge --strategy-option=theirs'
alias gmv='git mv' alias gmv='git mv'
alias gp='git push origin $(git_current_branch)' alias gp='git push origin $(git_current_branch)'
alias gpf='git push origin $(git_current_branch) --force' alias gpf='git push origin $(git_current_branch) --force'