[v13,10/27] stash: mention options in `show` synopsis

Message ID	20190225231631.30507-11-t.gummerer@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Thomas Gummerer <t.gummerer@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>, =?utf-8?q?SZED?= =?utf-8?q?ER_G=C3=A1bor?= <szeder.dev@gmail.com>, Thomas Gummerer <t.gummerer@gmail.com> Subject: [PATCH v13 10/27] stash: mention options in `show` synopsis Date: Mon, 25 Feb 2019 23:16:14 +0000 Message-Id: <20190225231631.30507-11-t.gummerer@gmail.com> In-Reply-To: <20190225231631.30507-1-t.gummerer@gmail.com> References: <nycvar.QRO.7.76.6.1902191127420.41@tvgsbejvaqbjf.bet> <20190225231631.30507-1-t.gummerer@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 [v13,00/27] Convert "git stash" to C builtin [v13,01/27] sha1-name.c: add `get_oidf()` which acts like `get_oid()` [v13,02/27] strbuf.c: add `strbuf_join_argv()` [v13,03/27] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()` [v13,04/27] ident: add the ability to provide a "fallback identity" [v13,05/27] stash: improve option parsing test coverage [v13,06/27] t3903: modernize style [v13,07/27] t3903: add test for --intent-to-add file [v13,08/27] stash: rename test cases to be more descriptive [v13,09/27] stash: add tests for `git stash show` config [v13,10/27] stash: mention options in `show` synopsis [v13,11/27] stash: convert apply to builtin [v13,12/27] stash: convert drop and clear to builtin [v13,13/27] stash: convert branch to builtin [v13,14/27] stash: convert pop to builtin [v13,15/27] stash: convert list to builtin [v13,16/27] stash: convert show to builtin [v13,17/27] stash: convert store to builtin [v13,18/27] stash: convert create to builtin [v13,19/27] stash: convert push to builtin [v13,20/27] stash: make push -q quiet [v13,21/27] stash: convert save to builtin [v13,22/27] stash: optimize `get_untracked_files()` and `check_changes()` [v13,23/27] stash: replace all `write-tree` child processes with API calls [v13,24/27] stash: convert `stash--helper.c` into `stash.c` [v13,25/27] stash: add back the original, scripted `git stash` [v13,26/27] stash: optionally use the scripted version again [v13,27/27] tests: add a special setup where stash.useBuiltin is off

Message ID

20190225231631.30507-11-t.gummerer@gmail.com (mailing list archive)

State

New, archived

Headers

From: Thomas Gummerer <t.gummerer@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
 Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>, =?utf-8?q?SZED?=
	=?utf-8?q?ER_G=C3=A1bor?= <szeder.dev@gmail.com>,
 Thomas Gummerer <t.gummerer@gmail.com>
Subject: [PATCH v13 10/27] stash: mention options in `show` synopsis
Date: Mon, 25 Feb 2019 23:16:14 +0000
Message-Id: <20190225231631.30507-11-t.gummerer@gmail.com>
In-Reply-To: <20190225231631.30507-1-t.gummerer@gmail.com>
References: <nycvar.QRO.7.76.6.1902191127420.41@tvgsbejvaqbjf.bet>
 <20190225231631.30507-1-t.gummerer@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

Thomas Gummerer Feb. 25, 2019, 11:16 p.m. UTC

From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>

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

Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@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

[v13,10/27] stash: mention options in `show` synopsis

Commit Message

Patch