diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-07-18 13:43:00 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 09:46:28 +0300 |
commit | 566c511195adc0ce88559853f2f00933e241d862 (patch) | |
tree | d9d5e46eecc90787a643cc84e6c120d0d52d10cc /Documentation/merge-options.txt | |
parent | e3cba962b172804ca1cab82801d94858154bd8cc (diff) |
Document that merge strategies can now take their own options
Also document the recently added -Xtheirs, -Xours and -Xsubtree[=path]
options to the merge-recursive strategy.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r-- | Documentation/merge-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index fec3394305..22606f03f3 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -74,3 +74,8 @@ option can be used to override --squash. -v:: --verbose:: Be verbose. + +-X <option>:: +--strategy-option=<option>:: + Pass merge strategy specific option through to the merge + strategy. |