Procedure 1
Identify the commit short hash
git log --pretty=oneline --abbrev-commit
abcd1234 Update to Fix for issue B
cdababcd Fix issue B
deab3412 Fix issue A
....
Here even git log --oneline
also can be used to get short hash.
If you want to squash (merge) last two commit
git rebase -i deab3412
This opens up a nano
editor for merging. And it looks like below
....
pick cdababcd Fix issue B
pick abcd1234 Update to Fix for issue B
....
Rename the word pick
to squash
which is present before abcd1234
. After rename it should be like below.
....
pick cdababcd Fix issue B
squash abcd1234 Update to Fix for issue B
....
Now save and close the nano
editor. Press ctrl + o
and press Enter
to save. And then press ctrl + x
to exit the editor.
Then nano
editor again opens for updating comments, if necessary update it.
Now its squashed successfully, you can verify it by checking logs.
git log --pretty=oneline --abbrev-commit
1122abcd Fix issue B
deab3412 Fix issue A
....
Now push to repo. Note to add +
sign before the branch name. This means forced push.
git push origin +master
Note : This is based on using git on ubuntu
shell. If you are using different os (Windows
or Mac
) then above commands are same except editor. You might get different editor.
Procedure 2
- First add the required files for commit
git add <files>
- Then commit using
--fixup
option and the OLDCOMMIT
should be on which we need to merge(squash) this commit.
git commit --fixup=OLDCOMMIT
Now this creates a new commit on top of HEAD with fixup1 <OLDCOMMIT_MSG>
.
3. After need to execute below command to merge(squash) the new commit to the OLDCOMMIT
.
- Then execute below command to merge(squash) the new commit to the
OLDCOMMIT
.
git rebase --interactive --autosquash OLDCOMMIT^
Here ^
means the previous commit to OLDCOMMIT
. This rebase
command opens interactive window on a editor (vim or nano) on that
we no need to do anything just save and exiting is sufficient. Because the option passed to this will automatically move the latest
commit to next to old commit and change the operation to fixup
(equivalent to squash). Then rebase continues and finishes.
Conclusion
- Advantage of 1st procedure is to squash multiple commits and to reorder. But this procedure will be difficult if we need to merge a fix to very old commit.
- So the 2nd procedure helps to merge the commit to very old commit easily.