rwx.work/sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gm

Browse source
This commit is contained in:
Marc Beninca 2024-11-17 13:59:52 +01:00
parent 1bafe4d385
commit 03d4f4289c
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
shell/alias/git.sh
View file

@ -314,6 +314,15 @@ git_log_patch() {
} }
glp() { git_log_patch "${@}"; } glp() { git_log_patch "${@}"; }
# fast-forward merge to remote branch
git_merge() {
git \
merge \
--ff-only \
"${@}"
}
gm() { git_merge "${@}"; }
# abort the current merge commit # abort the current merge commit
git_merge_abort() { git_merge_abort() {
git \ git \
@ -333,14 +342,6 @@ git_merge_commit() {
} }
gmc() { git_merge_commit "${@}"; } gmc() { git_merge_commit "${@}"; }
# fast-forward to remote branch
gmf() {
git \
merge \
--ff-only \
"${@}"
}
# squash a branch and index its modifications # squash a branch and index its modifications
gms() { gms() {
git \ git \