mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git tag documentation grammar fixes and readability updates
  grep: Add the option '--line-number'
This commit is contained in:
Junio C Hamano
2011-03-28 14:17:17 -07:00
parent 730477f199 f1723ee6b3
commit 61e8aaf621
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/grep.c
View File

@ -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,