gm
This commit is contained in:
parent
1bafe4d385
commit
03d4f4289c
1 changed files with 9 additions and 8 deletions
|
@ -314,6 +314,15 @@ 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
|
||||
git_merge_abort() {
|
||||
git \
|
||||
|
@ -333,14 +342,6 @@ git_merge_commit() {
|
|||
}
|
||||
gmc() { git_merge_commit "${@}"; }
|
||||
|
||||
# fast-forward to remote branch
|
||||
gmf() {
|
||||
git \
|
||||
merge \
|
||||
--ff-only \
|
||||
"${@}"
|
||||
}
|
||||
|
||||
# squash a branch and index its modifications
|
||||
gms() {
|
||||
git \
|
||||
|
|
Loading…
Reference in a new issue