gm
This commit is contained in:
parent
ad467c223c
commit
afac1464dc
1 changed files with 36 additions and 7 deletions
|
@ -212,20 +212,49 @@ alias glp='git log --all --graph \
|
||||||
# log medium information
|
# log medium information
|
||||||
alias glm='git log --all --decorate --graph --pretty=medium'
|
alias glm='git log --all --decorate --graph --pretty=medium'
|
||||||
|
|
||||||
# fast-forward to remote branch
|
# abort the current merge commit
|
||||||
alias gmf='git merge --ff-only'
|
alias gma="\
|
||||||
|
git \
|
||||||
|
merge \
|
||||||
|
--abort \
|
||||||
|
"
|
||||||
|
|
||||||
# do a merge commit
|
# do a merge commit
|
||||||
alias gmc='git merge --no-ff -m'
|
alias gmc="\
|
||||||
|
git \
|
||||||
|
merge \
|
||||||
|
--no-ff \
|
||||||
|
-m \
|
||||||
|
"
|
||||||
|
|
||||||
# abort the current merge commit
|
# do a signed merge commit
|
||||||
alias gma='git merge --abort'
|
alias gmcs="\
|
||||||
|
git \
|
||||||
|
merge \
|
||||||
|
--no-ff \
|
||||||
|
--gpg-sign \
|
||||||
|
-m \
|
||||||
|
"
|
||||||
|
|
||||||
|
# fast-forward to remote branch
|
||||||
|
alias gmf="\
|
||||||
|
git \
|
||||||
|
merge \
|
||||||
|
--ff-only \
|
||||||
|
"
|
||||||
|
|
||||||
# squash a branch and index its modifications
|
# squash a branch and index its modifications
|
||||||
alias gms='git merge --squash'
|
alias gms="\
|
||||||
|
git \
|
||||||
|
merge \
|
||||||
|
--squash \
|
||||||
|
"
|
||||||
|
|
||||||
# merge via external tool
|
# merge via external tool
|
||||||
alias gmt='git mergetool'
|
alias gmt="\
|
||||||
|
git \
|
||||||
|
mergetool \
|
||||||
|
"
|
||||||
|
|
||||||
# push to the remote repository
|
# push to the remote repository
|
||||||
alias gp="\
|
alias gp="\
|
||||||
|
|
Loading…
Reference in a new issue