diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2009-11-25 21:23:55 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 22:45:06 -0800 |
| commit | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 (patch) | |
| tree | a7fc209fac5df7d2a9c9a5795fb4f58746ae3840 /merge-recursive.h | |
| parent | 73eb40eeaaebc5ebae283c06286b96b4aea00143 (diff) | |
| download | git-8cc5b29065e19267cbc08b39c34674b02c2e3d59.tar.gz | |
git merge -X<option>
Teach "-X <option>" command line argument to "git merge" that is passed to
strategy implementations. "ours" and "theirs" autoresolution introduced
by the previous commit can be asked to the recursive strategy.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index fd138ca140..39de100cd5 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -6,7 +6,11 @@ struct merge_options { const char *branch1; const char *branch2; - unsigned subtree_merge : 1; + enum { + MERGE_RECURSIVE_SUBTREE = 1, + MERGE_RECURSIVE_OURS, + MERGE_RECURSIVE_THEIRS, + } recursive_variant; unsigned buffer_output : 1; int verbosity; int diff_rename_limit; |