How do I combine 2 commits into one when the previous one was already pushed?
Step 1
git add file.txt git commit git push Step 2
git add file.txt git commit 
- 3Be careful with this if you have other developers who may have pulled the published commit. Best practice is not to alter commits that have already been pushed. Doing so will “rewrite history” and require extra work for others working on the project.Justin Wager– Justin Wager2018-10-11 23:50:53 +00:00Commented Oct 11, 2018 at 23:50
- Possible duplicate of how to combine commits and push to the remotephd– phd2018-10-12 01:14:15 +00:00Commented Oct 12, 2018 at 1:14
- stackoverflow.com/search?q=%5Bgit%5D+combine+commitsphd– phd2018-10-12 01:14:23 +00:00Commented Oct 12, 2018 at 1:14
Add a comment |
4 Answers
You can do it using rebasing. Squash the last two commits with git rebase -i HEAD~2. Then do a force push with git push --force**.
** Generally you should prefer --force-with-lease over --force. If someone else were to push to the branch you are pushing --force would overwrite their changes. --force-with-lease would only force push if no one else has pushed to that branch.
Comments
git add file.txt git commit --amend git push --force The usual warnings about --force apply.
Comments
Try:
git reset --soft HEAD~2 git commit -m "Your new message" git push --force What this does:
- Reset your current branch (moves
HEAD) to antepenultimate commit (the one before the penultimate, represented byHEAD~2) but leaves the index and the working tree. - This allows to re-stage these changes and commit them in a brand new commit.
--forceallows you to push this new commit and force an override.
NOTE
As others have commented on your original question, beware that --force will most likely annoy other people that have already pulled the previous version of this branch. You could "squash" these changes into a new branch and publish it separately:
git reset --soft HEAD~2 git checkout -b my-new-clean-branch git commit -m "Your new message" git push -u origin HEAD This way you don't need to --force anything.
3 Comments
Code-Apprentice
You should probably include an explanation about the effects this will have on other developers who may have pulled the branch.
Code-Apprentice
Squashing into a new branch just duplicates the changes in two different commits. The OP and other visitors should just be aware that a force push can cause problems for others who pulled the branch. Squashing should only be used when no one else is on the same branch
Fernando Espinosa
@Code-Apprentice The idea here is that you could "abandon" the previous branch and start a new independent history. Also, you are truly committing the combined changes of 2 commits into a single one, which is what was asked how to achieve.
Follow these commands in order.
git add .
git commit --amend
git push origin <branch> -f
