SHELL

git squash last 2 commits

git rebase -i HEAD~2

git squash commits merge

# Say your bug fix branch is called bugfix and you want to merge it into master
git checkout master
git merge --squash bugfix
git commit

# This will take all the commits from the bugfix branch, 
# squash them into 1 commit, 
# and merge it with your master branch.

git squash commits

$ git rebase -i HEAD~3

git squash commit

git rebase -i HEAD~5
# As the commit on line 1 is HEAD, in most cases you would leave this as 
# pick. You cannot use squash or fixup as there is no other commit to 
# squash the commit into.

git squash commits on branch

Another way to squash all your commits is to reset the index to master:

git checkout yourBranch
git reset $(git merge-base master $(git branch --show-current))
git add -A
git commit -m "one commit on yourBranch"

git squash commits

To modify a commit that is farther back in your history, you must move
to more complex tools. Git doesn’t have a modify-history tool, 
but you can use the rebase tool to rebase a series of commits onto the 
HEAD that they were originally based on instead of moving them to 
another one. With the interactive rebase tool, you can then stop 
after each commit you want to modify and change the message, add files, 
or do whatever you wish. You can run rebase interactively by adding 
the -i option to git rebase. You must indicate how far back you want to 
rewrite commits by telling the command which commit to rebase onto.

For example, if you want to change the last three commit messages, 
or any of the commit messages in that group, you supply as an argument 
to git rebase -i the parent of the last commit you want to edit, 
which is HEAD~2^ or HEAD~3. It may be easier to remember the ~3 
because you’re trying to edit the last three commits, but keep in 
mind that you’re actually designating four commits ago, the parent 
of the last commit you want to edit:

$ git rebase -i HEAD~3

Remember again that this is a rebasing command — every commit in the
range HEAD~3..HEAD with a changed message and all of its descendants
will be rewritten. Don’t include any commit you’ve already pushed to
a central server — doing so will confuse other developers by providing
an alternate version of the same change.

Running this command gives you a list of commits in your text editor
that looks something like this:

```
pick f7f3f6d Change my name a bit
pick 310154e Update README formatting and add blame
pick a5f4a0d Add cat-file

```

If, instead of “pick” or “edit”, you specify “squash”, Git applies 
both that change and the change directly before it and makes you 
merge the commit messages together. So, if you want to make a single 
commit from these three commits, you make the script look like this:

```
pick f7f3f6d Change my name a bit
squash 310154e Update README formatting and add blame
squash a5f4a0d Add cat-file

```



When you save and exit the editor, Git applies all three changes and 
then puts you back into the editor to merge the three commit messages:
 
```

# This is a combination of 3 commits.
# The first commit's message is:
Change my name a bit

# This is the 2nd commit message:
Update README formatting and add blame

# This is the 3rd commit message:
Add cat-file

```
When you save that, you have a single commit that introduces the changes
of all three previous commits.

merge / or squash /or combine multiple commits easily

# you are in a branch2 which has multiple commits which you want to combine into 1 
and merge into branch1

git rebase <branch_to_merge_into> -i

pick and squash the commits you want