summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-05 13:39:53 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-05 13:39:53 -0700
commit1eb5609b6b3e2908ee747dfe313c24f17334ce26 (patch)
tree7399ab13ecb59275ff9caa0624441831a5b0f8de /config.txt
parent70d664063d4eb347c0d30071e08a40fbf72dcd34 (diff)
downloadgit-htmldocs-1eb5609b6b3e2908ee747dfe313c24f17334ce26.tar.gz
Autogenerated HTML docs for v2.6.1-120-g24a00e
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt14
1 files changed, 11 insertions, 3 deletions
diff --git a/config.txt b/config.txt
index 0cc87a6f6..4d3cb107f 100644
--- a/config.txt
+++ b/config.txt
@@ -1829,9 +1829,7 @@ log.abbrevCommit::
log.date::
Set the default date-time mode for the 'log' command.
Setting a value for log.date is similar to using 'git log''s
- `--date` option. Possible values are `relative`, `local`,
- `default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]
- for details.
+ `--date` option. See linkgit:git-log[1] for details.
log.decorate::
Print out the ref names of any commits that are shown by the log
@@ -2587,6 +2585,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