Skip to content

Commit

Permalink
Git alias for "squash" merging
Browse files Browse the repository at this point in the history
There was only the `m` alias that merges the specified branch in
non-fast-forward mode. To do a "squash" merge (1) a new `ms` alias has
been added using the default fast-forward mode.

References:
  (1) https://help.github.com/en/articles/about-pull-request-merges#squash-and-merge-your-pull-request-commits

Resolves GH-208
  • Loading branch information
arcticicestudio committed Jul 31, 2019
1 parent 6f483af commit 78ccf4c
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions snowblocks/git/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,24 @@
# +---------------------+
# + Interaction - Merge +
# +---------------------+
# Merges the specified branch in non-fast-forward mode.
# Merges the specified branch in non-fast-forward mode with output about stats.
#
# See:
# https://help.github.com/en/articles/about-pull-request-merges
# Usage:
# git m <BRANCH>
m = merge --no-ff
m = merge --no-ff --stat

# +---------------------+
# + Interaction - Merge +
# +---------------------+
# "Squashes" and merges the specified branch in fast-forward (default) mode with output about stats.
#
# See:
# https://help.github.com/en/articles/about-pull-request-merges#squash-and-merge-your-pull-request-commits
# Usage:
# git ms <BRANCH>
ms = merge --ff --squash --stat

# +--------------------+
# + Interaction - Pull +
Expand Down

0 comments on commit 78ccf4c

Please sign in to comment.