[PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged

From: Thomas Rast tr...@inf.ethz.ch Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. --- Unchanged. Documentation/merge-strategies.txt | 4

[PATCH 3/3] merge-recursive: -Xindex-only to leave worktree unchanged

Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. --- Documentation/merge-strategies.txt | 4 merge-recursive.c | 2 ++