From 88252b2d91d0e8bf79d6d1aff373d69bbc23dda7 Mon Sep 17 00:00:00 2001 From: Cameron Drake Date: Mon, 16 Mar 2015 12:15:05 -0700 Subject: [PATCH] PR feedback --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c33ebd6..c19ccf6 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,9 @@ If everything is successful, you should see something like this: (master)$ Successfully rebased and updated refs/heads/master. ``` ### Possible issues with merging -Safe merging strategy: +#### Safe merging strategy: +```--no-commit``` performs the merge but pretends the merge failed and does not autocommit, giving the user a chance to inspect and further tweak the merge result before committing. ```no-ff``` maintains evidence that a feature branch once existed, keeping project history consistent. + ```sh (master)$ git merge --no-ff --no-commit featurebranch ``` @@ -203,7 +205,7 @@ Since rebasing **replaces the old commit(s) with a new one**, you must force pus Check out a new branch, then return to your master branch ``` -(master)$ git checkout -b new-branch +(master)$ git checkout -b new-branch (new-branch)$ git checkout master (master)$ ``` @@ -229,7 +231,7 @@ Author: Alex Lee Date: Tue Jul 22 15:39:27 2014 -0400 Bug #21 - Added CSRF protection - + commit 5ea51731d150f7ddc4a365437931cd8be3bf3131 Author: Alex Lee Date: Tue Jul 22 15:39:12 2014 -0400