gma,gmc,gmf,gms,gmt

This commit is contained in:
Marc Beninca 2024-11-17 02:26:32 +01:00
parent 0eea7d052e
commit 235202a64d
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F

View file

@ -294,39 +294,44 @@ glp() {
}
# abort the current merge commit
alias gma="\
git \
merge \
--abort \
"
gma() {
git \
merge \
--abort \
"${@}"
}
# do a merge commit
alias gmc="\
git \
merge \
--no-ff \
--message \
"
gmc() {
git \
merge \
--no-ff \
--message \
"${@}"
}
# fast-forward to remote branch
alias gmf="\
git \
merge \
--ff-only \
"
gmf() {
git \
merge \
--ff-only \
"${@}"
}
# squash a branch and index its modifications
alias gms="\
git \
merge \
--squash \
"
gms() {
git \
merge \
--squash \
"${@}"
}
# merge via external tool
alias gmt="\
git \
mergetool \
"
gmt() {
git \
mergetool \
"${@}"
}
# push to the remote repository
alias gp="\