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 /contrib/examples | |
| 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 'contrib/examples')
| -rwxr-xr-x | contrib/examples/git-merge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 500635fe4b..8f617fcb70 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -31,10 +31,11 @@ LF=' ' all_strategies='recur recursive octopus resolve stupid ours subtree' +all_strategies="$all_strategies recursive-ours recursive-theirs" default_twohead_strategies='recursive' default_octopus_strategies='octopus' no_fast_forward_strategies='subtree ours' -no_trivial_strategies='recursive recur subtree ours' +no_trivial_strategies='recursive recur subtree ours recursive-ours recursive-theirs' use_strategies= allow_fast_forward=t |