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/config.txt | |
| parent | 88bad58d3860a8e0cf6499951e24311d15bc63f0 (diff) | |
| parent | 3086c064fbbf3c4d086f9d7c303d9aa76f5204b2 (diff) | |
| download | git-5e9a74b48013a99daff50c2995ad9de80685335f.tar.gz | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 10 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 |