![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jul 2008 09:43:00 +0000 (02:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jan 2010 06:46:28 +0000 (22:46 -0800) | ||
| commit | 566c511195adc0ce88559853f2f00933e241d862 | |
| tree | d9d5e46eecc90787a643cc84e6c120d0d52d10cc | tree | snapshot |
| parent | e3cba962b172804ca1cab82801d94858154bd8cc | commit | 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>
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>
| Documentation/merge-options.txt | diff | blob | history | |
| Documentation/merge-strategies.txt | diff | blob | history |