From 1f03c898e6138a58c31363b0cd9e782cea85bbc4 Mon Sep 17 00:00:00 2001 From: Chris May Date: Mon, 13 May 2024 11:49:19 -0400 Subject: [PATCH 1/3] correct spelling mistake: `hour` -> `our` --- _learning_hours/git/interactive_rebase.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_learning_hours/git/interactive_rebase.md b/_learning_hours/git/interactive_rebase.md index d944ce6..5717e99 100644 --- a/_learning_hours/git/interactive_rebase.md +++ b/_learning_hours/git/interactive_rebase.md @@ -8,7 +8,7 @@ author: xaviametller # Git interactive rebase -Git is a powerful source control system that, among other options, allows us to redefine the history which can be very handy. Sometimes hour commit history can be messy and this capability allows us to rewrite the story as we'd like to read it instead of how it happened. +Git is a powerful source control system that, among other options, allows us to redefine the history which can be very handy. Sometimes our commit history can be messy and this capability allows us to rewrite the story as we'd like to read it instead of how it happened. This learning hour is meant to understand what are some possibilities and put them in practice. From b34a6ad1d2b67f794b1b9224ff946e5e84edb592 Mon Sep 17 00:00:00 2001 From: Chris May Date: Mon, 13 May 2024 11:52:19 -0400 Subject: [PATCH 2/3] add commas to intro paragraph to aid readability --- _learning_hours/git/interactive_rebase.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_learning_hours/git/interactive_rebase.md b/_learning_hours/git/interactive_rebase.md index 5717e99..805ede1 100644 --- a/_learning_hours/git/interactive_rebase.md +++ b/_learning_hours/git/interactive_rebase.md @@ -8,7 +8,7 @@ author: xaviametller # Git interactive rebase -Git is a powerful source control system that, among other options, allows us to redefine the history which can be very handy. Sometimes our commit history can be messy and this capability allows us to rewrite the story as we'd like to read it instead of how it happened. +Git is a powerful source control system that, among other options, allows us to redefine the history, which can be very handy. Sometimes, our commit history can be messy, and this capability allows us to rewrite the story as we'd like to read it instead of how it happened. This learning hour is meant to understand what are some possibilities and put them in practice. From b1622e4d5e95ceca0296245d3845ab2c006a3e37 Mon Sep 17 00:00:00 2001 From: Chris May Date: Mon, 13 May 2024 12:02:19 -0400 Subject: [PATCH 3/3] clarify language around explaining how interactive rebase works --- _learning_hours/git/interactive_rebase.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_learning_hours/git/interactive_rebase.md b/_learning_hours/git/interactive_rebase.md index 805ede1..ad4a941 100644 --- a/_learning_hours/git/interactive_rebase.md +++ b/_learning_hours/git/interactive_rebase.md @@ -54,7 +54,7 @@ Split the commit in two and move the evenResult change into the previous commit > 2. The fifth exercise is more complex than the previous four ones, maybe not everyone will have to make it. If only some persons can do it, you can let them facilitate or explain how did they do it to the rest of the group. ## Explain how interactive rebase works -Sit with someone from another couple/group, and write in a post-it a summary of how does Git interactive rebase work. +Sit with someone from another couple/group and write a summary of how Git interactive rebase works on a Post-it note. ## Acknowledgements LH created while working as Tech Coach for [SunwebGroup](https://www.sunwebgroup.com/) on top of the [Kata](https://github.com/xrecoba/Tennis-Refactoring-Git-Kata) created while working for [Volcànic](https://volcanicinternet.com/en/).