title: Do I have to commit a merge to make git-rerere record my conflict resolution?
body: <p>I'm using <code>git-rerere</code> for its intended purpose, to record conflict resolutions between two branches (master and a topic branch) incrementally as those branches develop, without creating unnecessary merge commits. However, even after reading the git-rerere manpage I'm a little unclear on when rerere actually records my conflict resolution. My standard workflow for detecting and resolving new merge conflicts is to do <code>git merge master</code> from the topic branch, resolve the conflicts, then stage all the files and commit the merge with <code>git commit -m "Finished test merge"</code>, and then undo the merge using <code>git reset --hard HEAD^</code>, leaving behind only the recorded resolutions stored by <code>git-rerere</code>.</p>
  
  <p>However, this seems a bit silly. Creating a commit and then undoing it just to record the resolution? After reading the manpage for <code>git-rerere</code>, I'm still not really clear on when it records my resolutions. Is it sufficient to just stage the conflicted files or do I actually need to create the merge commit after resolving the conflicts, like I've been doing?</p>