@@ -413,78 +413,7 @@ include::config/splitindex.txt[]
413413
414414include::config/ssh.txt[]
415415
416- status.relativePaths::
417- By default, linkgit:git-status[1] shows paths relative to the
418- current directory. Setting this variable to `false` shows paths
419- relative to the repository root (this was the default for Git
420- prior to v1.5.4).
421-
422- status.short::
423- Set to true to enable --short by default in linkgit:git-status[1].
424- The option --no-short takes precedence over this variable.
425-
426- status.branch::
427- Set to true to enable --branch by default in linkgit:git-status[1].
428- The option --no-branch takes precedence over this variable.
429-
430- status.displayCommentPrefix::
431- If set to true, linkgit:git-status[1] will insert a comment
432- prefix before each output line (starting with
433- `core.commentChar`, i.e. `#` by default). This was the
434- behavior of linkgit:git-status[1] in Git 1.8.4 and previous.
435- Defaults to false.
436-
437- status.renameLimit::
438- The number of files to consider when performing rename detection
439- in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to
440- the value of diff.renameLimit.
441-
442- status.renames::
443- Whether and how Git detects renames in linkgit:git-status[1] and
444- linkgit:git-commit[1] . If set to "false", rename detection is
445- disabled. If set to "true", basic rename detection is enabled.
446- If set to "copies" or "copy", Git will detect copies, as well.
447- Defaults to the value of diff.renames.
448-
449- status.showStash::
450- If set to true, linkgit:git-status[1] will display the number of
451- entries currently stashed away.
452- Defaults to false.
453-
454- status.showUntrackedFiles::
455- By default, linkgit:git-status[1] and linkgit:git-commit[1] show
456- files which are not currently tracked by Git. Directories which
457- contain only untracked files, are shown with the directory name
458- only. Showing untracked files means that Git needs to lstat() all
459- the files in the whole repository, which might be slow on some
460- systems. So, this variable controls how the commands displays
461- the untracked files. Possible values are:
462- +
463- --
464- * `no` - Show no untracked files.
465- * `normal` - Show untracked files and directories.
466- * `all` - Show also individual files in untracked directories.
467- --
468- +
469- If this variable is not specified, it defaults to 'normal'.
470- This variable can be overridden with the -u|--untracked-files option
471- of linkgit:git-status[1] and linkgit:git-commit[1].
472-
473- status.submoduleSummary::
474- Defaults to false.
475- If this is set to a non zero number or true (identical to -1 or an
476- unlimited number), the submodule summary will be enabled and a
477- summary of commits for modified submodules will be shown (see
478- --summary-limit option of linkgit:git-submodule[1]). Please note
479- that the summary output command will be suppressed for all
480- submodules when `diff.ignoreSubmodules` is set to 'all' or only
481- for those submodules where `submodule.<name>.ignore=all`. The only
482- exception to that rule is that status and commit will show staged
483- submodule changes. To
484- also view the summary for ignored submodules you can either use
485- the --ignore-submodules=dirty command-line option or the 'git
486- submodule summary' command, which shows a similar output but does
487- not honor these settings.
416+ include::config/status.txt[]
488417
489418stash.showPatch::
490419 If this is set to true, the `git stash show` command without an
0 commit comments