From 2e8db72be9ab16cffefe24b5aa4c65cb0750fa72 Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Wed, 19 Jul 2017 12:39:08 -0400 Subject: [PATCH] Updated Branching Merging (markdown) --- Branching---Merging.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Branching---Merging.md b/Branching---Merging.md index c9f55d1..4d02596 100644 --- a/Branching---Merging.md +++ b/Branching---Merging.md @@ -20,14 +20,15 @@ git rebase origin/master When working locally, do whatever you want. Before sharing, clean up your history into logical commits and write good commit messages for them. -*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* - ``` git fetch 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* + + ## Rebase and non-ff-merge into master when you're done ```