| commit | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 | |
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Thu, 26 Nov 2009 02:23:55 +0000 (25 21:23 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jan 2010 06:45:06 +0000 (17 22:45 -0800) | ||
| tree | a7fc209fac5df7d2a9c9a5795fb4f58746ae3840 | treesnapshot (tar.gz zip) |
| parent | 73eb40eeaaebc5ebae283c06286b96b4aea00143 | commitdiff |
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>
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>