title: git merge --continue with --no-commit
body: <p>Is there a workaround for not committing with command &quot;git merge --continue&quot;</p>
  <p>I am trying to do auto-merge with command <code># git merge -q --no-commit --no-ff --no-edit origin/myBranch --progress -m &quot;Auto merge&quot;</code> - This works if there is no conflict.</p>
  <p>However when there is a conflict on a specific folder, which I want to exclude from merge (<code>git reset folderName</code>) and then issuing a command that <code># git merge --continue with --no-commit</code></p>
  <p><code>git merge --continue</code> takes no more arguments like --no-commit (<code>fatal: --continue expects no arguments</code>)</p>
  <p><code>git merge --continue</code> makes automatic commit and results in below.</p>
  <pre><code>git status
  
      On branch program/XYZ
      Your branch is ahead of 'origin/XYZ' by 10 commits.
        (use &quot;git push&quot; to publish your local commits)
  </code></pre>