Alice: amending commits

It is easy to realize there was an error just a second after commiting some files. Here, Alice will correct one of such mistakes.

Lab

  • She starts by reaching her working area
cd
cd alice/book
  • Alice just realizes they forgot to write the name of the different chapters. It is going to take some work to correct it, so she creates a new branch (the project is starting to get some complexity, so she agrees with Bob to use feat as the prefix for feature oriented branches)
git checkout -b feat_headings
  • Now she will start updating the different chapters, starting with the first one:
ed chapter-01.md << EOF
2i

## Chapter one
.
w
q
EOF

cat chapter-01.md
  • Time to update the repo:
git add chapter-01.md
git commit -m "Updated chapter"
  • Umh… looking at the project history, Alice is not very proud of her last commit message
git log --oneline
So she is going to replace the message by replacing the old `commit` with a new one, changing the commit message. This action, in effect, will rewrite the history of the project (although in a very controlled way)
git commit --████ -m "Added chapter number (1)"

Solution

git commit --amend -m "Added chapter number (1)"
  • Now it looks much better:
git log --oneline

git reflog