Squash the first two commits in a git repository's history

gistfile1.md

The scenario

Your repository has two commits:

$ git log --oneline
957fbfb No, I am your father.
9bb71ff A long time ago in a galaxy far, far away....

Use the interactive rebase tool to squash the two commits:

$ git rebase -i 9bb71ff

When your editor opens, only a single commit is listed:

pick 957fbfb No, I am your father.

You change pick to squash, save & close your editor.

The problem

Git complains...

Cannot 'squash' without a previous commit

The fix

$ git rebase -i 9bb71ff

This time, when your editor opens, change pick to edit instead of squash, save & close your editor.

$ git reset --soft HEAD^
$ git commit --amend

Your editor again so that you can modify the commit message of the soon-to-be squashed commit; make your changes, save & close the editor.

$ git rebase --continue

Thanks! Short explanation on the internals of this operation? 😁

the simplest way is git reset --soft head^ then git commit --amend without using git rebase

Thanks very much for this... will bookmark this link for sure.

👍

@nineSean thanks

@nineSean 👍 💯

😍

the simplest way is git reset --soft head^ then git commit --amend without using git rebase

👍

for anyone just want to modify commit Author, then you can do
git reset --soft head^
git commit --amend --author="Author Name <[email protected]>" --no-edit

Awesome! Thanks :)

Thanks!

Thanks! In case of an issue with zsh: zsh: no matches found: HEAD^, don't forget to escape the ^ symbol with \:

git reset --soft HEAD\^`

You can also use HEAD~1 if HEAD^ doesnt work

I just do it simpler:

git rebase -i HEAD~N , where N - commits count in your branch (including first one)

and then do any operations you usually do in interactive mode