diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-28 14:17:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-28 14:17:17 -0700 |
| commit | 61e8aaf6215a2983610a770645e6d0a24bafb454 (patch) | |
| tree | dafb753af176f0303e7a65f775004c38c85f08f2 /builtin | |
| parent | tests: fix overeager scrubbing of environment variables (diff) | |
| parent | git tag documentation grammar fixes and readability updates (diff) | |
| download | tgif-61e8aaf6215a2983610a770645e6d0a24bafb454.tar.xz | |
Merge branch 'maint'
* maint:
git tag documentation grammar fixes and readability updates
grep: Add the option '--line-number'
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 0bf8c0116a..85e9583a13 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -769,7 +769,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_BOOLEAN('F', "fixed-strings", &opt.fixed, "interpret patterns as fixed strings"), OPT_GROUP(""), - OPT_BOOLEAN('n', NULL, &opt.linenum, "show line numbers"), + OPT_BOOLEAN('n', "line-number", &opt.linenum, "show line numbers"), OPT_NEGBIT('h', NULL, &opt.pathname, "don't show filenames", 1), OPT_BIT('H', NULL, &opt.pathname, "show filenames", 1), OPT_NEGBIT(0, "full-name", &opt.relative, |