From 2329808d2e65a004835ba693c10c04beb93dcce4 Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Wed, 19 Jul 2017 12:41:46 -0400 Subject: [PATCH] Updated Branching and Merging (markdown) --- Branching-and-Merging.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Branching-and-Merging.md b/Branching-and-Merging.md index 178d12e..1b6ed9a 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -26,7 +26,7 @@ git rebase -i origin/master git push -u origin your_branch_name ``` -*Tip: make lots of small commits, 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