diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
| commit | fcb2a7e4a3c7899a3432f5804889fa3ea5779220 (patch) | |
| tree | 0f0785d427c23c7b8dbaae1afcdbd370ea3b639c /git.c | |
| parent | e98f80f50bf9b78aab8cea6184fd708259d0c3b3 (diff) | |
| parent | 566c511195adc0ce88559853f2f00933e241d862 (diff) | |
| download | git-fcb2a7e4a3c7899a3432f5804889fa3ea5779220.tar.gz git-fcb2a7e4a3c7899a3432f5804889fa3ea5779220.tar.xz | |
Merge branch 'ap/merge-backend-opts'
* ap/merge-backend-opts:
Document that merge strategies can now take their own options
Extend merge-subtree tests to test -Xsubtree=dir.
Make "subtree" part more orthogonal to the rest of merge-recursive.
pull: Fix parsing of -X<option>
Teach git-pull to pass -X<option> to git-merge
git merge -X<option>
git-merge-file --ours, --theirs
Conflicts:
git-compat-util.h
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 }, |