Fixed #117

Author: hemanth

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

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"