gma,gmc,gmf,gms,gmt

shell/alias/git.sh

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