diff options
author | Avery Pennarun <apenwarr@gmail.com> | 2009-11-26 02:23:55 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 06:45:06 (GMT) |
commit | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 (patch) | |
tree | a7fc209fac5df7d2a9c9a5795fb4f58746ae3840 /generate-cmdlist.sh | |
parent | 73eb40eeaaebc5ebae283c06286b96b4aea00143 (diff) | |
download | git-8cc5b29065e19267cbc08b39c34674b02c2e3d59.zip git-8cc5b29065e19267cbc08b39c34674b02c2e3d59.tar.gz git-8cc5b29065e19267cbc08b39c34674b02c2e3d59.tar.bz2 |
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 'generate-cmdlist.sh')
0 files changed, 0 insertions, 0 deletions