From: Junio C Hamano Date: Wed, 18 Jul 2018 19:20:31 +0000 (-0700) Subject: Merge branch 'vs/typofixes' X-Git-Tag: v2.19.0-rc0~157 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eb9056358ce2cd124f769886c70e1427a0182813?ds=inline;hp=-c Merge branch 'vs/typofixes' Doc fix. * vs/typofixes: Documentation: spelling and grammar fixes --- eb9056358ce2cd124f769886c70e1427a0182813 diff --combined Documentation/config.txt index a68ce9bb95,98ffbd2087..536291cb6c --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -354,7 -354,7 +354,7 @@@ advice.*: Advice on what to do when you've accidentally added one git repo inside of another. ignoredHook:: - Advice shown if an hook is ignored because the hook is not + Advice shown if a hook is ignored because the hook is not set as executable. waitingForEditor:: Print a message to the terminal whenever Git is waiting for @@@ -1162,8 -1162,7 +1162,8 @@@ color.diff.: color.decorate.:: Use customized color for 'git log --decorate' output. `` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local - branches, remote-tracking branches, tags, stash and HEAD, respectively. + branches, remote-tracking branches, tags, stash and HEAD, respectively + and `grafted` for grafted commits. color.grep:: When set to `always`, always highlight matches. When `false` (or @@@ -3328,13 -3327,12 +3328,13 @@@ submodule..ignore: submodule..active:: Boolean value indicating if the submodule is of interest to git commands. This config option takes precedence over the - submodule.active config option. + submodule.active config option. See linkgit:gitsubmodules[7] for + details. submodule.active:: A repeated field which contains a pathspec used to match against a submodule's path to determine if the submodule is of interest to git - commands. + commands. See linkgit:gitsubmodules[7] for details. submodule.recurse:: Specifies if commands recurse into submodules by default. This