Merge branch 'js/clean-report-too-long-a-path' into maint

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 056dfb86612d0c5be0d01f16ac6b126fac80b92c..e31ea7d3037d55207132fc6ab07b52b7710199af 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -9,12 +9,12 @@ SYNOPSIS
 --------
 [verse]
 'git stash' list [<options>]
-'git stash' show [<stash>]
+'git stash' show [<options>] [<stash>]
 'git stash' drop [-q|--quiet] [<stash>]
 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
 'git stash' branch <branchname> [<stash>]
 'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
-            [-u|--include-untracked] [-a|--all] [-m|--message <message>]]
+            [-u|--include-untracked] [-a|--all] [-m|--message <message>]
             [--] [<pathspec>...]]
 'git stash' clear
 'git stash' create [<message>]
@@ -106,7 +106,7 @@ stash@{1}: On master: 9cc0589... Add git-stash
 The command takes options applicable to the 'git log'
 command to control what is shown and how. See linkgit:git-log[1].
 
-show [<stash>]::
+show [<options>] [<stash>]::
 
        Show the changes recorded in the stash entry as a diff between the
        stashed contents and the commit back when the stash entry was first