Can I change merging options on single files mid merge?

Okay say I’ve done git merge production. I’ve resolved a few issues but now I’d like to retry merging a specific file with -Xignore-all-space. My current strategy is to simply abort my merge, and restart it with -Xignore-all-space, is there some way I can change this mid merge?

  • How to make git-diff and git log ignore new and deleted files?
  • How can I remotely edit/create a wiki for a GitHub Repo?
  • Remove all commits by author
  • Git ignore ANY changes to a git repository
  • Move issues from Bitbucket to Github
  • An error was raised by libgit2. Category = 21 (MergeConflict)
  • git commit error message: cannot open (a previously deleted source file)
  • Use sudoer to restart server in post-receive git hook
  • I want to reset my current Git branch to master branch
  • Make git reset --hard to ignore permission changes
  • Introduction to Git and practical usage patterns
  • `git rebase --onto --preserve-merges` reproduces the conflicts I already resolved in a merge
  • Git Baby is a git and github fan, let's start git clone.