linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-09 02:24:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(git): add new merge aliases for development and main branches

Browse source
This commit is contained in:
Celestino Gomes 2025-12-27 11:48:13 -03:00
commit 4143e62143
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/git/git.plugin.zsh
View file

@ -254,7 +254,9 @@ alias gfg='git ls-files | grep'
alias gm='git merge' alias gm='git merge'
alias gma='git merge --abort' alias gma='git merge --abort'
alias gmc='git merge --continue' alias gmc='git merge --continue'
alias gmd='git merge $(git_develop_branch)'
alias gms="git merge --squash" alias gms="git merge --squash"
alias gmod='git merge origin/$(git_develop_branch)'
alias gmom='git merge origin/$(git_main_branch)' alias gmom='git merge origin/$(git_main_branch)'
alias gmum='git merge upstream/$(git_main_branch)' alias gmum='git merge upstream/$(git_main_branch)'
alias gmtl='git mergetool --no-prompt' alias gmtl='git mergetool --no-prompt'