diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 251724ab7..e71fd3a73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-09-22 Øystein Walle <oystwa@gmail.com> + + * 31752: Completion/Unix/Command/_git: _git: change completion + text for consistency + 2013-09-22 m0viefreak <m0viefreak.cm@googlemail.com> * 31753: Completion/Unix/Command/_git: _git: correct some diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index d465dfaf8..2dc9ed2cc 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1934,7 +1934,7 @@ _git-config () { 'difftool.*.cmd:command to invoke for the diff tool::_path_commands' 'difftool.*.path:path to use for the diff tool:absolute diff tool path:_files -g "*(*)"' difftool.prompt:'prompt before each invocation of the diff tool::->bool:true' - diff.wordRegex:'regex used to determine what a word is when performing word-by-word diff:regex:->string' + diff.wordRegex:'regex used to determine what a word is when performing word-by-word diff:regular expression:->string' diff.guitool:'diff tool with gui to use::__git_difftools' fetch.unpackLimit:'maximum number of objects to unpack when fetching:unpack limit:->int' fetch.recurseSubmodules:'recurse into submodules (as needed) when fetching::->fetch.recurseSubmodules:on-demand' |