From 447dcbe33d3d3c6064fba2f707fe1555d8732412 Mon Sep 17 00:00:00 2001 From: Tiffany Date: Sun, 29 Nov 2020 12:03:58 -0600 Subject: [PATCH 1/2] Fix typo --- book/07-git-tools/sections/rewriting-history.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/07-git-tools/sections/rewriting-history.asc b/book/07-git-tools/sections/rewriting-history.asc index 1c54ce253..71095e5eb 100644 --- a/book/07-git-tools/sections/rewriting-history.asc +++ b/book/07-git-tools/sections/rewriting-history.asc @@ -56,7 +56,7 @@ $ git commit --amend --no-edit ==== Changing Multiple Commit Messages To modify a commit that is farther back in your history, you must move to more complex tools. -Git doesn't have a modify-history tool, but you can use the rebase tool to rebase a series of commits onto the HEAD they were originally based on instead of moving them to another one. +Git doesn't have a modify-history tool, but you can use the rebase tool to rebase a series of commits onto the HEAD that were originally based on instead of moving them to another one. With the interactive rebase tool, you can then stop after each commit you want to modify and change the message, add files, or do whatever you wish. You can run rebase interactively by adding the `-i` option to `git rebase`. You must indicate how far back you want to rewrite commits by telling the command which commit to rebase onto. From a9f5595562ea12d94b3628ccc8ce9228308cce41 Mon Sep 17 00:00:00 2001 From: Tiffany Date: Sun, 29 Nov 2020 12:15:37 -0600 Subject: [PATCH 2/2] Update with suggested wording change from my comment --- book/07-git-tools/sections/rewriting-history.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/07-git-tools/sections/rewriting-history.asc b/book/07-git-tools/sections/rewriting-history.asc index 71095e5eb..95806d383 100644 --- a/book/07-git-tools/sections/rewriting-history.asc +++ b/book/07-git-tools/sections/rewriting-history.asc @@ -56,7 +56,7 @@ $ git commit --amend --no-edit ==== Changing Multiple Commit Messages To modify a commit that is farther back in your history, you must move to more complex tools. -Git doesn't have a modify-history tool, but you can use the rebase tool to rebase a series of commits onto the HEAD that were originally based on instead of moving them to another one. +Git doesn't have a modify-history tool, but you can use the rebase tool to rebase a series of commits onto the HEAD that they were originally based on instead of moving them to another one. With the interactive rebase tool, you can then stop after each commit you want to modify and change the message, add files, or do whatever you wish. You can run rebase interactively by adding the `-i` option to `git rebase`. You must indicate how far back you want to rewrite commits by telling the command which commit to rebase onto.