title: Integrating a branch in the middle of another branch
body: <p>There is a project where versions are managed only with a master branch and tagging. </p>
  
  <p>I have to make a hotfix for a specific release and integrate it in the master branch.</p>
  
  <p>The problem: The master branch already contains other commits which I don't want to include in the hotfix. </p>
  
  <p><code>Current state:
               (TAG: v3.2.0)
                    |
  ... ---C1---C2---C3---C4---C5---C6   (master)
                    \
                     \---C7---C8       (fix_bug_branch)
                               |
                          (TAG: v3.2.1)
  </code></p>
  
  <p><code>Desired state:
               (TAG: v3.2.0)
                    |
  ... ---C1---C2---C3---C7---C8---C4---C5---C6  (master)
                             |
                        (TAG: v3.2.1)
  </code></p>
  
  <p>Is it possible to rebase or merge a scenario like that? How?</p>