summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-21 04:28:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 04:28:50 (GMT)
commitfcb2a7e4a3c7899a3432f5804889fa3ea5779220 (patch)
tree0f0785d427c23c7b8dbaae1afcdbd370ea3b639c /merge-recursive.h
parente98f80f50bf9b78aab8cea6184fd708259d0c3b3 (diff)
parent566c511195adc0ce88559853f2f00933e241d862 (diff)
downloadgit-fcb2a7e4a3c7899a3432f5804889fa3ea5779220.zip
git-fcb2a7e4a3c7899a3432f5804889fa3ea5779220.tar.gz
git-fcb2a7e4a3c7899a3432f5804889fa3ea5779220.tar.bz2
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 'merge-recursive.h')
-rw-r--r--merge-recursive.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h
index d8bc729..be8410a 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -6,7 +6,12 @@
struct merge_options {
const char *branch1;
const char *branch2;
- unsigned subtree_merge : 1;
+ enum {
+ MERGE_RECURSIVE_NORMAL = 0,
+ MERGE_RECURSIVE_OURS,
+ MERGE_RECURSIVE_THEIRS,
+ } recursive_variant;
+ const char *subtree_shift;
unsigned buffer_output : 1;
int verbosity;
int diff_rename_limit;