diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-30 14:49:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 14:49:53 -0700 |
| commit | 967cda7cb7d2494c0cff6ebf0ad40fde587fb892 (patch) | |
| tree | 53a75ad7da700bc405f2c40931a58f9fd39c6086 /config.txt | |
| parent | 535c65caafa13821295c3b060a5acd98bd2557b7 (diff) | |
| download | git-htmldocs-967cda7cb7d2494c0cff6ebf0ad40fde587fb892.tar.gz | |
Autogenerated HTML docs for v2.13.2-556-g5116f
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/config.txt b/config.txt index 781ce3e85..06898a749 100644 --- a/config.txt +++ b/config.txt @@ -686,7 +686,8 @@ core.packedGitLimit:: bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process. + -Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. +Default is 256 MiB on 32 bit platforms and 32 TiB (effectively +unlimited) on 64 bit platforms. This should be reasonable for all users/operating systems, except on the largest projects. You probably do not need to adjust this value. + @@ -2623,7 +2624,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 +2996,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 +3038,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:: |