From 6c2e089663170a74fd881135f48e102cf2b7d91b Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Wed, 19 Jul 2017 12:49:21 -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 194d686..9c7738c 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -31,7 +31,7 @@ git push -u origin your_branch_name ## Rebase and non-ff-merge into master when you're done -We want a merge commit present for all code merged from PRs, even if that PR is only one commit. The merge commit documents that the merge came from a PR. This helps us differentiate between commits to straight master. +We want a merge commit present for all code merged from PRs, even if that PR is properly rebased and only a single commit. The merge commit documents that the merge came from a PR. This helps us differentiate between commits to straight master. ``` git fetch