vulporuza/.dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aliases: Make aliases tolerant to main branch in git

Browse Source
This commit is contained in:
Robin-Charles Guihéneuf 2022-11-18 17:09:05 +01:00
parent 2538ab1863
commit 7ebd50b761
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.bash_aliases
View File

@ -77,18 +77,22 @@ alias vpn="sudo openvpn --config $HOME/Nextcloud/#\ -\ Configs/rguiheneuf.ovpn"
alias gs='git status' alias gs='git status'
alias gc='git checkout' alias gc='git checkout'
alias gcm='git checkout master'
alias gpl='git pull' alias gpl='git pull'
alias gph='git push' alias gph='git push'
alias gsu='git submodule update --init' alias gsu='git submodule update --init'
alias gcp='git cherry-pick' alias gcp='git cherry-pick'
function gcm {
( git rev-parse --verify origin/master > /dev/null 2>&1 ) && git checkout master
( git rev-parse --verify origin/main > /dev/null 2>&1 ) && git checkout main
}
alias add='git add' alias add='git add'
alias commit='git commit -m "To fixup"' alias commit='git commit -m "To fixup"'
alias cont='git rebase --continue' alias cont='git rebase --continue'
# Git cleaners # Git cleaners
alias branch_clean='git branch --merged | egrep -v "(^\*|master|dev)" | xargs git branch -d' alias branch_clean='git branch --merged | egrep -v "(^\*|master|main|dev)" | xargs git branch -d'
alias tag_clean='git tag -l | xargs git tag -d && git fetch -t' alias tag_clean='git tag -l | xargs git tag -d && git fetch -t'
function git_parent { function git_parent {
@ -152,13 +156,16 @@ function grbm {
# Save current branch # Save current branch
BRANCH=$(git branch | grep \* | cut -d ' ' -f2) BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
# Checkout master & pull # Checkout master/main & pull
git checkout master gcm
git pull git pull
# Save parent branch
PARENT=$(git branch | grep \* | cut -d ' ' -f2)
# Back to previous branch # Back to previous branch
git checkout ${BRANCH} git checkout ${BRANCH}
git rebase --interactive master git rebase --interactive ${PARENT}
} }
function grbi { function grbi {
@ -189,8 +196,16 @@ function ga {
} }
function gam { function gam {
git autofixup master # Checkout master/main & pull
git rebase --interactive --autosquash master gcm
# Save parent branch
PARENT=$(git branch | grep \* | cut -d ' ' -f2)
git checkout -
git autofixup ${PARENT}
git rebase --interactive --autosquash ${PARENT}
} }
function gai { function gai {