Merge pull request #211 from jatzz10/add-git-squash-merge-command

Add git squash merge command
arshadkazmi42 · Feb 4, 2023 · 4e110b3 · 4e110b3
2 parents 3f9bfe7 + 2d4cd90
commit 4e110b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -83,6 +83,7 @@ Give us a :star: if you like our work :heart:
 - [Stash List](commands/git/git-stash-list.md) - Check stash stack list.
 - [Stash Revert](commands/git/git-stash-revert.md) - Revert stashed changes from stash stack.
 - [Switch Branch](commands/git/git-switch-branch.md) - Switch current working branch.
+- [Squash Merge Branch](commands/git/git-squash-merge-branch.md) - Squash merge branch to master
 
 ## Heroku
 

diff --git a/commands/git/git-squash-merge-branch.md b/commands/git/git-squash-merge-branch.md
@@ -0,0 +1,13 @@
+### Squash Merge a branch to the master
+
+Merge branch to the master by combining all commits of the branch and merging as a single commit
+
+`git merge --squash {{BRANCH}}`
+
+- <b>BRANCH: </b> Branch which needs to be squash merged to the master
+
+#### Example:
+
+`git merge --squash feature-add-dashboard`
+
+This will merge the branch `feature-add-dashboard` to the master, and will squash all branch commits into a single commit in master