diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:03:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:03:13 -0700 |
| commit | 1692d0c64a6386ae08d12ed90c9d975911451cbe (patch) | |
| tree | 94398b8e23fa0f5f15fce10a128aa0757e3ad3e6 /Documentation/git-grep.txt | |
| parent | Merge branch 'jc/maint-1.7.3-checkout-describe' (diff) | |
| parent | grep: add --heading (diff) | |
| download | tgif-1692d0c64a6386ae08d12ed90c9d975911451cbe.tar.xz | |
Merge branch 'rs/grep-color'
* rs/grep-color:
grep: add --heading
grep: add --break
grep: fix coloring of hunk marks between files
Diffstat (limited to 'Documentation/git-grep.txt')
| -rw-r--r-- | Documentation/git-grep.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index e150c77cff..07b3c6a086 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -148,6 +148,13 @@ OPTIONS gives the default to color output. Same as `--color=never`. +--break:: + Print an empty line between matches from different files. + +--heading:: + Show the filename above the matches in that file instead of + at the start of each shown line. + -[ABC] <context>:: Show `context` trailing (`A` -- after), or leading (`B` -- before), or both (`C` -- context) lines, and place a |