[PATCH] Fix capitalization of "renamelimit" in docs to agree with code
Signed-off-by: Pete Harlan <pgit@pcharlan.com>
---
The documentation and bash-completion have always capitalized
"renamelimit" as "renameLimit". The code has always lowercased the
whole name. Repair the docs.
Documentation/diff-config.txt | 2 +-
Documentation/merge-config.txt | 4 ++--
contrib/completion/git-completion.bash | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 1aed79e..1b9a314 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -86,7 +86,7 @@ diff.mnemonicprefix::
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
-diff.renameLimit::
+diff.renamelimit::
The number of files to consider when performing the copy/rename
detection; equivalent to the 'git diff' option '-l'.
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 861bd6f..fdb3cb6 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -32,10 +32,10 @@ merge.log::
actual commits that are being merged. Defaults to false, and
true is a synonym for 20.
-merge.renameLimit::
+merge.renamelimit::
The number of files to consider when performing rename detection
during a merge; if not specified, defaults to the value of
- diff.renameLimit.
+ diff.renamelimit.
merge.renormalize::
Tell git that canonical representation of files in the
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index cc1bdf9..76f66e1 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2122,7 +2122,7 @@ _git_config ()
diff.ignoreSubmodules
diff.mnemonicprefix
diff.noprefix
- diff.renameLimit
+ diff.renamelimit
diff.renames
diff.suppressBlankEmpty
diff.tool
@@ -2218,7 +2218,7 @@ _git_config ()
merge.
merge.conflictstyle
merge.log
- merge.renameLimit
+ merge.renamelimit
merge.renormalize
merge.stat
merge.tool