diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:10 -0700 |
| commit | 5e9a74b48013a99daff50c2995ad9de80685335f (patch) | |
| tree | f10be94deb7534b25d165c4dec79ab7adc89b7a9 /Documentation | |
| parent | Merge branch 'jk/async-pkt-line' (diff) | |
| parent | stash: allow "stash show" diff output configurable (diff) | |
| download | tgif-5e9a74b48013a99daff50c2995ad9de80685335f.tar.xz | |
Merge branch 'nk/stash-show-config'
Users who are too busy to type three extra keystrokes to ask for
"git stash show -p" can now set stash.showPatch configuration
varible to true to always see the actual patch, not just the list
of paths affected with feel for the extent of damage via diffstat.
* nk/stash-show-config:
stash: allow "stash show" diff output configurable
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 10 | ||||
| -rw-r--r-- | Documentation/git-stash.txt | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0cc87a6f65..e935cbdc00 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2587,6 +2587,16 @@ status.submoduleSummary:: submodule summary' command, which shows a similar output but does not honor these settings. +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. + 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. + See description of 'show' command in linkgit:git-stash[1]. + submodule.<name>.path:: submodule.<name>.url:: The path within this project and URL for a submodule. These diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 375213fe46..92df596e5f 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -95,6 +95,8 @@ show [<stash>]:: shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent stash in patch form). + You can use stash.showStat and/or stash.showPatch config variables + to change the default behavior. pop [--index] [-q|--quiet] [<stash>]:: |