title: Git: preserve branch topology on a merge commit
body: <p>I would like to ask about Git merging in the following scenario:</p>
  
  <pre><code>branchA  -*-*-*-*-*
                     \
              branchB *-*-*-*
  </code></pre>
  
  <p>It is possible to do a git merge in this case an obtain the following result?</p>
  
  <pre><code>branchA  -*-*-*-*-*---------*
                     \       /
              branchB *-*-*-*
  </code></pre>
  
  <p>What I would like to obtain is to have a single merge commit on branchA, that incorporates all changes from branchB.
  I know that there is --squash option in git merge command, however I wasn't sure whether that would be 100% equivalent to standard merge.</p>
  
  <p>Thus allow me to prevent my branch topology and <em>not</em> have just a fast forward.</p>
  
  <p>Thank you very much in advance for help!</p>