summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-01-09 15:10:04 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-01-10 10:00:14 -0800
commitab4356111afb28568bf1ad2e909b6ecf9f83a5e6 (patch)
treea1e508cb76b349019bfe7221439b0b867f6fb681 /git-merge-octopus.sh
parentGit 1.7.0.9 (diff)
downloadtgif-ab4356111afb28568bf1ad2e909b6ecf9f83a5e6.tar.xz
docs: explain diff.*.binary option
This was added long ago as part of the userdiff refactoring for textconv, as internally it made the code simpler and cleaner. However, there was never a concrete use case for actually using the config variable. Now that Matthieu Moy has provided such a use case, it's easy to explain it using his example. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions