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 /git.c | |
| 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 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -332,6 +332,8 @@ static void handle_internal_command(int argc, const char **argv) { "merge-file", cmd_merge_file }, { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, + { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, + { "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "mktree", cmd_mktree, RUN_SETUP }, { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, |