title: GIT rebase requires to recommit changes
body: <p>Before anything else, I'm just new to git branching. I wasn't aware that every feature branch should be branched out from <code>master</code> and only use the pre-requisite feature branch with such relation to the next feature branch.</p>
  
  <p>I have three branches. <code>master</code>, <code>feature-1</code> and <code>feature-2</code> all pushed the a Bitbucket repository (with issue tracking enabled). The thing is commits <code>M4</code> and <code>M5</code> are critical commits that all branches should rebase it before committing a merge (task of <code>git rebase</code>)</p>
  
  <pre><code>M1 -- M2 -- M3 -- M4 -- M5   [master]
    \        /
     A1 --- A2                 [feature-1]
             \
              B1 -- B2 -- B3   [feature-2]
  </code></pre>
  
  <p>The development for <code>feature-2</code> is done and is now needed to be merged to master. Here's the precedence of tasks I've done for <code>feature-2</code> to rebase <code>M4</code> and <code>M5</code> commits to <code>feature-2</code>.</p>
  
  <ol>
  <li><code>git push</code> - development of <code>feature-2</code></li>
  <li><code>git checkout feature-2</code></li>
  <li><code>git rebase master</code></li>
  <li>Resolve conflicts</li>
  <li><code>git pull</code></li>
  </ol>
  
  <p>After doing those steps I've noticed after executing <code>git status</code>. I have to push again all the commits (<code>feature-2</code>, <code>M4</code>, <code>M5</code> and conflict commits). Well all I have to do is just do <code>git push</code> and initiate the pull request and I'm done, right? But that would add another git commit comments to the issue tracker.</p>
  
  <p>Is there a way to rebase <code>feature-2</code> to <code>master</code> without the need to push again the commits of <code>feature-2</code>, <code>M4</code> and <code>M5</code> and the <code>git log</code> should contain conflict commits.</p>
  
  <p><strong>Update</strong></p>
  
  <ul>
  <li>Change the question details for better clarrification</li>
  </ul>