From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:42:33 +0000 (-0800)
Subject: Merge branch 'ma/diff-doc-clarify-regexp-example' into maint
X-Git-Tag: v2.25.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b907ca76f0897f9a7f070a106c7706fc399509da;p=thirdparty%2Fgit.git

Merge branch 'ma/diff-doc-clarify-regexp-example' into maint

Doc clarification.

* ma/diff-doc-clarify-regexp-example:
  diff-options.txt: avoid "regex" overload in example
---

b907ca76f0897f9a7f070a106c7706fc399509da