rebases and merge feature branch to master.

Author: hemanth

README.md

@@ -50,6 +50,7 @@
 * [Update all the submodules](https://github.com/git-tips/tips#update-all-the-submodules)
 * [Show all commits in the current branch yet to be merged to master](https://github.com/git-tips/tips#show-all-commits-in-the-current-branch-yet-to-be-merged-to-master)
 * [Rename a branch](https://github.com/git-tips/tips#rename-a-branch)
+* [rebases 'feature' to 'master' and merges it in to master ](https://github.com/git-tips/tips#rebases-feature-to-master-and-merges-it-in-to-master)
 
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end toc -->
@@ -353,5 +354,10 @@ __Alternatives:__
 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}
+```
+
 <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
 <!-- @doxie.inject end -->

tips.json

@@ -196,5 +196,9 @@
     "title": "Rename a branch",
     "tip": "git branch -m <new-branch-name>",
     "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}"
   }
 ]