title: Show commits affecting a file that are not in a feature branch?
body: <p>Given <code>branch-a</code> and <code>git rebase origin/master branch-a</code>, sometimes you get conflicts in a file.</p>
  
  <pre><code>CONFLICT (content): Merge conflict in .../file.txt
  </code></pre>
  
  <p>Given that before the rebase there were no conflicts (by definition), then conflicts can only have occurred b/c one or more commits to <code>.../file.txt</code>.</p>
  
  <p>During the conflict resolution process, I can't figure out a way to easily show "commits from origin/master that affected .../file.txt" so that I can more confidently integrate those changes.</p>
  
  <pre><code>---A---B---[C]---D
      \             \
       E---[F]---G   E'--[C/F']--G'
  </code></pre>
  
  <p><code>ABCD</code> is mainline development.  <code>EFG</code> is my local branch development.  Commit <code>C</code> caused a conflict in file/commit <code>F</code> during my local rebase onto <code>D</code>.</p>
  
  <p>Given a detached HEAD or "rebasing" state, when I do <code>git log -3 file.txt</code> it doesn't seem to show me what I want to see, which is <em>WHAT</em> was the diff (ie: commit <code>C</code>) which caused the conflict I'm trying to resolve now when applying commit <code>F</code>.</p>
  
  <p>How can I get a list of commits which only affect a particular file and are from the range <code>ABCD</code>... not including my commits in <code>EFG</code> or the currently active <code>--rebase</code>?</p>