From: Junio C Hamano Date: Tue, 11 Jun 2013 20:31:04 +0000 (-0700) Subject: Merge branch 'rr/diffcore-pickaxe-doc' X-Git-Tag: v1.8.4-rc0~184 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/71e120202fe073bd2e4e9db59ca01ab7c5e72f7e?ds=inline;hp=--cc Merge branch 'rr/diffcore-pickaxe-doc' Update the low-level diffcore documentation on -S/-G and --pickaxe-all. * rr/diffcore-pickaxe-doc: diffcore-pickaxe doc: document -S and -G properly diffcore-pickaxe: make error messages more consistent --- 71e120202fe073bd2e4e9db59ca01ab7c5e72f7e