path: root/Documentation
diff options
authorJunio C Hamano <>2018-05-30 05:04:07 (GMT)
committerJunio C Hamano <>2018-05-30 05:04:07 (GMT)
commit5da4847dccdf8df26f0cfbcc278034a62dbc97e0 (patch)
tree28772809fb164c3368790a7557dc84c72fcb254e /Documentation
parent50f08db5941755b69012378bfc86f6b8ee98edf4 (diff)
parente8b2dc2c2a8415bfd180ecf5cc237a54e69ac2e9 (diff)
Merge branch 'bp/status-rename-config'
"git status" learned to honor a new status.renames configuration to skip rename detection, which could be useful for those who want to do so without disabling the default rename detection done by the "git diff" command. * bp/status-rename-config: add status config and command line options for rename detection
Diffstat (limited to 'Documentation')
2 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 84e2891..460c14f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3179,6 +3179,18 @@ status.displayCommentPrefix::
behavior of linkgit:git-status[1] in Git 1.8.4 and previous.
Defaults to false.
+ The number of files to consider when performing rename detection
+ in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to
+ the value of diff.renameLimit.
+ Whether and how Git detects renames in linkgit:git-status[1] and
+ linkgit:git-commit[1] . If set to "false", rename detection is
+ disabled. If set to "true", basic rename detection is enabled.
+ If set to "copies" or "copy", Git will detect copies, as well.
+ Defaults to the value of diff.renames.
If set to true, linkgit:git-status[1] will display the number of
entries currently stashed away.
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index c16e27e..c4467ff 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -135,6 +135,16 @@ ignored, then the directory is not shown, but all contents are shown.
Display or do not display detailed ahead/behind counts for the
branch relative to its upstream branch. Defaults to true.
+ Turn on/off rename detection regardless of user configuration.
+ See also linkgit:git-diff[1] `--no-renames`.
+ Turn on rename detection, optionally setting the similarity
+ threshold.
+ See also linkgit:git-diff[1] `--find-renames`.
See the 'pathspec' entry in linkgit:gitglossary[7].