title: undo or revert git am --resolved
body: <p>I was manually applying the patch and after I was done I did the following</p>
  
  <pre><code>git add . 
  git am --resolved 
  </code></pre>
  
  <p>I had overlooked the part that the rej file was also present and was untracked but <code>git add .</code> added all the files to the staging area as expected and on <code>git am --resolved</code> I ended up committing my rej file which had the patch diffs . </p>
  
  <p>I did a <code>git reset --soft HEAD^</code> so I could revert the commit and just commit the file modified by the patch . </p>
  
  <p>But the issue now is that commit message and author would not be extracted from the patch file anymore since I did a git commit. </p>
  
  <p><strong>How do I undo a git resolved so I could remove the rej file and resolve again so the commit messages and author are intact?</strong> </p>