Merge branch 'maint'

* maint:
git tag documentation grammar fixes and readability updates
grep: Add the option '--line-number'

diff --cc Documentation/git-grep.txt
Simple merge

diff --cc Documentation/git-tag.txt
Simple merge

diff --cc builtin/grep.c
Simple merge