These commands will take what is currently staged and create aĬommit with a commit message prefixed with fixup! or squash!, respectively.Īfter this prefix will be the rest of the COMMIT_REF_TO_AMEND’s commit message. This is such a common operation that Git has some nice quality of lifeįor starters, when we are creating our new commit before running git rebase -interactive we can use git commit -fixup COMMIT_REF_TO_AMEND or git commit -squash COMMIT_REF_TO_AMEND. Modify the action from pick to squash or fixup, and reorder the rebase list all

quality of life improvementsīefore we were creating a new commit, having to remember which commit it amended, So now we’ve updated an existing commit by combining two commits to create anĮntirely new commit. My Git history now looks like: 3200347 (HEAD -> master) add sectionĪnd if we look at the diff of the second commit by running: git diff d9ec4e8^!

If you view the Git history ( git log -oneline) you’ll see that You’ll be prompted to create a commit message. I’m going to choose “fixup,” so my list looks like: pick 602d1dc specify THE cool projectĪfterwards save and exit the editor. So decide on which to use and change the “pick” to “squash” or Alternatively, fixup willĬombine the two commits and use the top (“older”) commit’s commit message automatically User to create a single message for the amended commit. Git will display both commits' messages and will leave it up to the Will have Git combine the two commits and open an editor to modify the commit These are similar to using git commit’s -no-edit flag. We have two choices on how to combine commits, This is close, but what we want is to combine our new commit Were to save this list and close our editor Git would rearrange the commits So far we’ve changed the order in which to pick the commits. Look like: pick 602d1dc specify THE cool projectīy default interactive rebase assumes we want to only pick all of these commitsĪs is. Newly created commit) and move it to be under the 602d1dc commit. We’ll want to take the bottom commit (our Execute: git rebase -interactive 602d1dc^Īnd Git will open an editor with content similar to: pick 602d1dc specify THE cool projectĪs a reminder, in this list the top is the “oldest” commit in the history and the bottom commit Just like with rewordingĪn old commit, we can use git rebase to combine commits. Now we want toĬombine the top commit ( 957e1c3 in my case) with the 602d1dc commit. The top commit’s SHA will be different for you, but the rest will be the same.

Run git log -oneline again to see the following output: 957e1c3 (HEAD -> master) add emphasis to theĭ1836f1 (origin/master, origin/HEAD) add section Git commit -message 'add emphasis to the'

Git create branch from older commit