diff options
| author |  Liam Beguin <liambeguin@gmail.com> | 2017-06-17 18:30:50 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-18 22:16:36 -0700 |
| commit | e01db917d8e5c66f9f90bf8c44995cf47200273a (patch) | |
| tree | a1733a90149933d7902f1906c4c67e02d3bd218c /Documentation/config.txt | |
| parent | sub-process: correct path to API docs in a comment (diff) | |
| download | tgif-e01db917d8e5c66f9f90bf8c44995cf47200273a.tar.xz | |
stash: update documentation to use 'stash entry'
Most of the time, a 'stash entry' is called a 'stash'. Lets try to make
this more consistent and use 'stash entry' instead.
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f6278a5ae6..23b807065d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2620,7 +2620,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 @@ -3029,12 +3029,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:: |