From 0e1bf6119302e3cb78a9f3a7c6de30799fdd6bcd Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 19 Jul 2017 13:44:22 -0400 Subject: [PATCH] minor typos --- Branching-and-Merging.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Branching-and-Merging.md b/Branching-and-Merging.md index 740299d..75ba469 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -1,4 +1,4 @@ -Git history is similar to code in that it is written once but it is read dozens of times. Therefore we optimize for readability. It should be clear what happened, by whom, when, and ideally why. +Git history is similar to code in that it is written once but it is read dozens of times. Therefore, we optimize for readability. It should be clear what happened, by whom, when, and ideally why. ## Start all work in a new branch off of master @@ -9,7 +9,7 @@ git checkout -b new_branch origin/master ## Rebase onto master daily -This reduces merge conflicts in the future +This reduces merge conflicts in the future. ``` git fetch @@ -26,7 +26,7 @@ git rebase -i origin/master git push -u origin your_branch_name ``` -*Tip: make lots of small commits as you work, then squash them into one or several bigger commits before pushing. This helps organize your work, so that logically separate changes can be placed into separate commits without manually splitting an existing commit* +*Tip: make lots of small commits as you work, then squash them into one or several bigger commits before pushing. This helps organize your work, so that logically separate changes can be placed into separate commits without manually splitting an existing commit.* ## Rebase and non-ff-merge into master when you're done