title: Difference between git pull --rebase and git pull --ff-only
body: <p>Let's say <code>origin/master</code> has commit <code>A--B--C</code> and my <code>local/master</code> has commit <code>A--B--D</code>.</p>
  
  <p>What will happen if I use <code>git pull --rebase</code> ?</p>
  
  <p>What will happen if I use <code>git pull --ff-only</code> ?</p>
  
  <p>Is there any difference in the resulting commit tree ?</p>