When we save and close our editor, git is going to remove all of theseĬommits from its history, then execute each line one at a time. Skim the full summary in your text editor. I've trimmed the summary to just theĭetails relevant to this part of the rebase guide, but feel free to

This is the rebase plan, and by editing this file you can instruct # f, fixup = like 'squash', but discard this commit's log message Pick 8d3fc77 Add greeting.txt pick 2a73a77 Add farewell.txt pick 0b9d0bb fixup greeting.txt # Rebase f5f19fb.0b9d0bb onto f5f19fb (3 commands) Last three commits this way, so we'll run git rebase -i Introduce a new tool: the interactive rebase. Use the new commit to 'fixup' the last one. So now the files look correct, but our history could be better - let's Looks like greeting.txt is missing 'world'. Need to correct an older commit? Let's start by setting up our sandbox +++ b/greeting.txt -0,0 +1 +Hello world! Fixing up older commitsĪmending only works for the most recent commit. You can see the fixed commitĬommit f5f19fbf6d35b2db37dcac3a55289ff9602e4d00 ( HEAD -> master ) Save and quit your editor (you have a chance to change amend will squash the changes into the most gitĪdd's) all files that git already knows about, and Let's add a file to our sandbox - and make a mistake:įixing this mistake is pretty easy. Let's start with something simple: fixing your most recent commit.

Find word in file in git history