title: Edit a merge commit with git rebase
body: <p>In Git when I have commits eg. <code>A - B - C</code> and I want to edit the <code>B</code> commit, I</p>
  
  <ul>
  <li>use <code>git rebase -i &lt;A-commit-hash&gt;</code>,</li>
  <li>in the list I write <code>edit</code> command in front of <code>B</code> commit,</li>
  <li>git rebase stops right after <code>B</code> commit so I can fix anything I want using <code>git commit --amend</code>,
  <li>and then I continue using <code>git rebase --continue</code>.</li>
  </ul>
  
  <p>As far as I know this is the best practice how to do this. With this method I can edit any commit in the past (as long as it hasn't been pushed to remote branch yet), and moreover with <code>-p</code> flag I can even preserve the merges. This is just great.</p>
  
  <p>My current problem is: I did a mistake (typo) on one line in a merge commit (while resolving a conflict when merging two branches).</p>
  
  <p>I'd like to fix it but I don't know how to make <code>git rebase</code> to stop at a merge commit. The <code>git rebase -p -i &lt;blah&gt;</code> list ignores merge commits, so I cannot write <code>edit</code> command in front of it and make the <code>git rebase</code> stop there to let me edit it.</p>
  
  <p>Any help please?
  I just want to fix this line in the merge commit while preserving all the commits (and merges) after it.</p>
  
  <p>Thanks.</p>