summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-05-25 20:05:24 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-26 12:59:05 +0900
commit7531a2dd876994479484968d361e18b70b2c764e (patch)
treeba5d003f24a2feab39e6702001fc8a5766f9542f /mergetools/p4merge
parentgrep: skip pthreads overhead when using one thread (diff)
downloadtgif-7531a2dd876994479484968d361e18b70b2c764e.tar.xz
log: add -P as a synonym for --perl-regexp
Add a short -P option as a synonym for the longer --perl-regexp, for consistency with the options the corresponding grep invocations accept. This was intentionally omitted in commit 727b6fc3ed ("log --grep: accept --basic-regexp and --perl-regexp", 2012-10-03) for unspecified future use. Make it consistent with "grep" rather than to keep it open for future use, and to avoid the confusion of -P meaning different things for grep & log, as is the case with the -G option. As noted in the aforementioned commit the --basic-regexp option can't have a corresponding -G argument, as the log command already uses that for -G<regex>. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions