From 3357955baa48d9c78304e8fe5858f4ebf158a913 Mon Sep 17 00:00:00 2001
From: "Hemanth.HM" <hemanth.hm@gmail.com>
Date: Mon, 15 Aug 2016 23:43:07 +0530
Subject: [PATCH] Fixed #117

---
 README.md | 2 +-
 tips.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 13a8c4f..fd4eb42 100644
--- a/README.md
+++ b/README.md
@@ -534,7 +534,7 @@ git branch -m [<old-branch-name>] <new-branch-name>
 
 ## Rebases 'feature' to 'master' and merges it in to master 
 ```sh
-git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}
+git rebase master feature && git checkout master && git merge -
 ```
 
 ## Archive the `master` branch
diff --git a/tips.json b/tips.json
index c01fedf..0d63138 100644
--- a/tips.json
+++ b/tips.json
@@ -185,7 +185,7 @@
     "alternatives": ["git branch -m [<old-branch-name>] <new-branch-name>"]
 }, {
     "title": "Rebases 'feature' to 'master' and merges it in to master ",
-    "tip": "git checkout feature && git rebase @{-1} && git checkout @{-2} && git merge @{-1}"
+    "tip": "git rebase master feature && git checkout master && git merge -"
 }, {
     "title": "Archive the `master` branch",
     "tip": "git archive master --format=zip --output=master.zip"