diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-26 14:09:29 -0700 |
| commit | 849b44cdf193908dfe1cadc731fb23019b53a211 (patch) | |
| tree | 06c56c63d2ffb408db7682c44fedc7c49a3f3787 /Documentation/config.txt | |
| parent | Sync with 2.13.2 (diff) | |
| parent | glossary: define 'stash entry' (diff) | |
| download | tgif-849b44cdf193908dfe1cadc731fb23019b53a211.tar.xz | |
Merge branch 'lb/status-stash-count'
"git status" learned to optionally give how many stash entries the
user has in its output.
* lb/status-stash-count:
glossary: define 'stash entry'
status: add optional stash count information
stash: update documentation to use 'stash entry'
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 781ce3e855..2845e8d5c4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2623,7 +2623,7 @@ rebase.autoSquash:: If set to true enable `--autosquash` option by default. rebase.autoStash:: - When set to true, automatically create a temporary stash + When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a @@ -2995,6 +2995,11 @@ status.displayCommentPrefix:: behavior of linkgit:git-status[1] in Git 1.8.4 and previous. Defaults to false. +status.showStash:: + If set to true, linkgit:git-status[1] will display the number of + entries currently stashed away. + Defaults to false. + status.showUntrackedFiles:: By default, linkgit:git-status[1] and linkgit:git-commit[1] show files which are not currently tracked by Git. Directories which @@ -3032,12 +3037,12 @@ status.submoduleSummary:: stash.showPatch:: If this is set to true, the `git stash show` command without an - option will show the stash in patch form. Defaults to false. + option will show the stash entry in patch form. Defaults to false. See description of 'show' command in linkgit:git-stash[1]. stash.showStat:: If this is set to true, the `git stash show` command without an - option will show diffstat of the stash. Defaults to true. + option will show diffstat of the stash entry. Defaults to true. See description of 'show' command in linkgit:git-stash[1]. submodule.<name>.url:: |