From: Pete Harlan <pgit@pcharlan.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] Fix capitalization of "renamelimit" in docs to agree with code
Date: Sun, 18 Dec 2011 16:34:52 -0800 [thread overview]
Message-ID: <4EEE86AC.2030802@pcharlan.com> (raw)
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
--
next reply other threads:[~2011-12-19 0:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 0:34 Pete Harlan [this message]
2011-12-19 0:51 ` [PATCH] Fix capitalization of "renamelimit" in docs to agree with code Jakub Narebski
2011-12-19 1:02 ` Junio C Hamano
2011-12-19 1:13 ` Pete Harlan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EEE86AC.2030802@pcharlan.com \
--to=pgit@pcharlan.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.