summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-18 09:43:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-18 06:46:28 (GMT)
commit566c511195adc0ce88559853f2f00933e241d862 (patch)
treed9d5e46eecc90787a643cc84e6c120d0d52d10cc /merge-recursive.h
parente3cba962b172804ca1cab82801d94858154bd8cc (diff)
downloadgit-566c511195adc0ce88559853f2f00933e241d862.zip
git-566c511195adc0ce88559853f2f00933e241d862.tar.gz
git-566c511195adc0ce88559853f2f00933e241d862.tar.bz2
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 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions