Re: [PATCH] git-stash.txt: document show options

2018-06-21 Thread Johannes Schindelin
Hi Mike,

there is a GSoC project going on to make `git stash` a builtin, and I
think that this change makes sense and at the same time needs to be
coordinated with Paul, who is performing that builtin work, so I Cc:ed him
for visibility.

Ciao,
Johannes

On Wed, 20 Jun 2018, Mike Frysinger wrote:

> Signed-off-by: Mike Frysinger 
> ---
>  Documentation/git-stash.txt | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> index 7ef8c4791177..76e4ca788102 100644
> --- a/Documentation/git-stash.txt
> +++ b/Documentation/git-stash.txt
> @@ -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 []::
> +show [] []::
>  
>   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
> @@ -116,6 +116,9 @@ show []::
>   to view the second most recent entry in patch form).
>   You can use stash.showStat and/or stash.showPatch config variables
>   to change the default behavior.
> ++
> +The command takes options applicable to the 'git diff'
> +command to control what is shown and how. See linkgit:git-diff[1].
>  
>  pop [--index] [-q|--quiet] []::
>  
> -- 
> 2.17.1
> 
> 


[PATCH] git-stash.txt: document show options

2018-06-20 Thread Mike Frysinger
Signed-off-by: Mike Frysinger 
---
 Documentation/git-stash.txt | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 7ef8c4791177..76e4ca788102 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -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 []::
+show [] []::
 
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
@@ -116,6 +116,9 @@ show []::
to view the second most recent entry in patch form).
You can use stash.showStat and/or stash.showPatch config variables
to change the default behavior.
++
+The command takes options applicable to the 'git diff'
+command to control what is shown and how. See linkgit:git-diff[1].
 
 pop [--index] [-q|--quiet] []::
 
-- 
2.17.1