diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-18 11:43:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 07:46:28 +0100 |
| commit | 566c511195adc0ce88559853f2f00933e241d862 (patch) | |
| tree | d9d5e46eecc90787a643cc84e6c120d0d52d10cc /transport.c | |
| parent | Extend merge-subtree tests to test -Xsubtree=dir. (diff) | |
| download | git-566c511195adc0ce88559853f2f00933e241d862.tar.xz git-566c511195adc0ce88559853f2f00933e241d862.zip | |
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 'transport.c')
0 files changed, 0 insertions, 0 deletions