* [PATCH] git-stash.txt: document show options
@ 2018-06-21 0:56 Mike Frysinger
2018-06-21 6:21 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Mike Frysinger @ 2018-06-21 0:56 UTC (permalink / raw)
To: git
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
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 [<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
@@ -116,6 +116,9 @@ show [<stash>]::
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] [<stash>]::
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-stash.txt: document show options
2018-06-21 0:56 [PATCH] git-stash.txt: document show options Mike Frysinger
@ 2018-06-21 6:21 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2018-06-21 6:21 UTC (permalink / raw)
To: Mike Frysinger; +Cc: Paul-Sebastian Ungureanu, git
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 <vapier@gentoo.org>
> ---
> 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 [<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
> @@ -116,6 +116,9 @@ show [<stash>]::
> 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] [<stash>]::
>
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-21 6:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-21 0:56 [PATCH] git-stash.txt: document show options Mike Frysinger
2018-06-21 6:21 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).