From 7c90a98b188ce8262db54d8ae109e5261ef4a39c Mon Sep 17 00:00:00 2001
From: Tommy Parnell <tparnell@cimpress.com>
Date: Fri, 10 Jul 2015 13:12:05 -0400
Subject: [PATCH] clarify merge/rebase

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index a4e0e5d..00d0c34 100644
--- a/readme.md
+++ b/readme.md
@@ -32,7 +32,7 @@ merge/rebase a branch into current branch by doing the following
 
 
 `git fetch --all` (fetch all changes from remote server)
-`git merge/rebase origin/BranchNameToMergeFrom` (merge in the changes from the remote branch)
+`git merge origin/BranchNameToMergeFrom` OR `git rebase origin/BranchNameToMergeFrom` (merge in the changes from the remote branch)
 
 ### Rebase or merge