[v12,09/26] stash: mention options in `show` synopsis

Message ID	1e187c54fcb13555e463c5b6f910b4bc13974e3e.1545331726.git.ungureanupaulsebastian@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com> To: git@vger.kernel.org Cc: t.gummerer@gmail.com, Johannes.Schindelin@gmx.de Subject: [PATCH v12 09/26] stash: mention options in `show` synopsis Date: Thu, 20 Dec 2018 21:44:25 +0200 Message-Id: <1e187c54fcb13555e463c5b6f910b4bc13974e3e.1545331726.git.ungureanupaulsebastian@gmail.com> In-Reply-To: <cover.1545331726.git.ungureanupaulsebastian@gmail.com> References: <cover.1545331726.git.ungureanupaulsebastian@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Convert "git stash" to C builtin \| expand [v12,00/26] Convert "git stash" to C builtin [v12,01/26] sha1-name.c: add `get_oidf()` which acts like `get_oid()` [v12,02/26] strbuf.c: add `strbuf_join_argv()` [v12,03/26] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()` [v12,04/26] ident: add the ability to provide a "fallback identity" [v12,05/26] stash: improve option parsing test coverage [v12,06/26] t3903: modernize style [v12,07/26] stash: rename test cases to be more descriptive [v12,08/26] stash: add tests for `git stash show` config [v12,09/26] stash: mention options in `show` synopsis [v12,10/26] stash: convert apply to builtin [v12,11/26] stash: convert drop and clear to builtin [v12,12/26] stash: convert branch to builtin [v12,13/26] stash: convert pop to builtin [v12,14/26] stash: convert list to builtin [v12,15/26] stash: convert show to builtin [v12,16/26] stash: convert store to builtin [v12,17/26] stash: convert create to builtin [v12,18/26] stash: convert push to builtin [v12,19/26] stash: make push -q quiet [v12,20/26] stash: convert save to builtin [v12,21/26] stash: optimize `get_untracked_files()` and `check_changes()` [v12,22/26] stash: replace all `write-tree` child processes with API calls [v12,23/26] stash: convert `stash--helper.c` into `stash.c` [v12,24/26] stash: add back the original, scripted `git stash` [v12,25/26] stash: optionally use the scripted version again [v12,26/26] tests: add a special setup where stash.useBuiltin is off

Message ID

1e187c54fcb13555e463c5b6f910b4bc13974e3e.1545331726.git.ungureanupaulsebastian@gmail.com (mailing list archive)

State

New, archived

Headers

From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
To: git@vger.kernel.org
Cc: t.gummerer@gmail.com, Johannes.Schindelin@gmx.de
Subject: [PATCH v12 09/26] stash: mention options in `show` synopsis
Date: Thu, 20 Dec 2018 21:44:25 +0200
Message-Id: 
 <1e187c54fcb13555e463c5b6f910b4bc13974e3e.1545331726.git.ungureanupaulsebastian@gmail.com>
In-Reply-To: <cover.1545331726.git.ungureanupaulsebastian@gmail.com>
References: <cover.1545331726.git.ungureanupaulsebastian@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Convert "git stash" to C builtin | expand

Commit Message

Paul-Sebastian Ungureanu Dec. 20, 2018, 7:44 p.m. UTC

Mention in the documentation, that `show` accepts any
option known to `git diff`.

Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
---
 Documentation/git-stash.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 7ef8c47911..e31ea7d303 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -9,7 +9,7 @@  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>]
@@ -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

[v12,09/26] stash: mention options in `show` synopsis

Commit Message

Patch