|
@@ -112,10 +112,13 @@ Aliases
|
|
|
### Merge
|
|
|
|
|
|
* `gm` joins two or more development histories together.
|
|
|
+ * `gma` aborts the conflict resolution, and reconstructs the pre-merge state.
|
|
|
* `gmC` performs the merge but does not commit.
|
|
|
* `gmF` performs the merge generating a commit even if the merge resolved as a
|
|
|
fast-forward.
|
|
|
- * `gma` aborts the conflict resolution, and reconstructs the pre-merge state.
|
|
|
+ * `gmS` commits with GPG signature.
|
|
|
+ * `gmv` verifies the GPG signature of the tip commit of the side branch being
|
|
|
+ merged.
|
|
|
* `gmt` runs the merge conflict resolution tools to resolve conflicts.
|
|
|
|
|
|
### Push
|