From 0d4070fb22a150bc5e2138f61bc7d6ae0eead0d2 Mon Sep 17 00:00:00 2001 From: Alex Grin Date: Thu, 12 Jul 2018 13:11:23 -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 976c8a0..d501c1b 100644 --- a/Branching-and-Merging.md +++ b/Branching-and-Merging.md @@ -33,7 +33,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 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. +We want a merge commit present for all code merged from branches or PRs, even if that branch or PR is properly rebased and only a single commit. The merge commit documents that the merge came from a branch/PR. This helps us differentiate those commits from commits that were made straight to master. ``` # on your_branch_name