summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-09-09 12:10:54 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-11 14:48:15 -0700
commit321459439e19517c412cab1cfbb64a2749f272c9 (patch)
treec554f8d87a9ba17218b7b96f4af7e18fd31eadfa /mergetools/tortoisemerge
parentcat-file --textconv/--filters: allow specifying the path separately (diff)
downloadtgif-321459439e19517c412cab1cfbb64a2749f272c9.tar.xz
cat-file: support --textconv/--filters in batch mode
With this patch, --batch can be combined with --textconv or --filters. For this to work, the input needs to have the form <object name><single white space><path> so that the filters can be chosen appropriately. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions