git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] diff-options.txt: correct command syntax

From
Adam Dinwoodie <adam@dinwoodie.org>
Date
Feb 2, 2020, 19:22 UTC
Message-ID
<20200202192226.29176-1-adam@dinwoodie.org>

Change the example arguments in the description of the -G diff argument to be consistent throughout the description.

Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org>
---
 Documentation/diff-options.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 09faee3b44..84a74cb2da 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -561,19 +561,19 @@ Binary files are searched as well.
 -G<regex>::
 	Look for differences whose patch text contains added/removed
 	lines that match <regex>.
 +
 To illustrate the difference between `-S<regex> --pickaxe-regex` and
 `-G<regex>`, consider a commit with the following diff in the same
 file:
 +
 ----
 +    return !regexec(regexp, two->ptr, 1, &regmatch, 0);
 ...
 -    hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);
 ----
 +
-While `git log -G"regexec\(regexp"` will show this commit, `git log
--S"regexec\(regexp" --pickaxe-regex` will not (because the number of
+While `git log -G<regex>` will show this commit, `git log
+-S<regex> --pickaxe-regex` will not (because the number of
 occurrences of that string did not change).
 +
 Unless `--text` is supplied patches of binary files without a textconv
-- 
2.25.0
Next: Martin Ågren
Message 1 of 7 in “diff-options.txt: correct command syntax”
  1. diff-options.txt: correct command syntaxAdam Dinwoodie, Feb 2, 2020
  2. Martin ÅgrenFeb 2, 2020
  3. Adam DinwoodieFeb 2, 2020
  4. Martin ÅgrenFeb 3, 2020
  5. diff-options.txt: avoid "regex" overload in exampleMartin Ågren, Feb 6, 2020
  6. Taylor BlauFeb 8, 2020
  7. Junio C HamanoFeb 9, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.