From patchwork Thu Nov 22 23:05:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul-Sebastian Ungureanu X-Patchwork-Id: 10694947 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3CE614BD for ; Thu, 22 Nov 2018 23:06:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C56F72C19A for ; Thu, 22 Nov 2018 23:06:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA5E22C1BB; Thu, 22 Nov 2018 23:06:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D12902C1A2 for ; Thu, 22 Nov 2018 23:06:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439026AbeKWJsB (ORCPT ); Fri, 23 Nov 2018 04:48:01 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:34195 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439013AbeKWJsA (ORCPT ); Fri, 23 Nov 2018 04:48:00 -0500 Received: by mail-wm1-f68.google.com with SMTP id y185so6435205wmd.1 for ; Thu, 22 Nov 2018 15:06:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TOL1w0BjCkT9kGjHI9tWKDJF2SRfghtPQI9KHJZm1iE=; b=THPMQ8tmArQwusydQHneaQXrhVJHE8CMNm9ZgdbXBvmhYmcgUlakkMvY4ka332+Rgf Rhf2vy71paVjmdCtjPzx9r7bqJYdu3fL9pGcidAtBeD2oNQakeA6+1ic2zAJevM2i9Ck nDo4vtcx0ycf8NA3EYQ3kTZs6ZhV/NQ95UwmUHHuzL49Q9/tga34x2X7d0/CKlhGbK3A D7YkOpI/XV2Nf4S7RaO9efwTJRpi8kJtMoOuLFmMy9x6NMkBJXqs1z09fZxAoRm1r74i 59BlfEPALL3ntLiuGDP9RlWGD5p2cZ9uh/5e2WLfldobwoqfb1FiFu8z+S4UStDdR1rJ f8Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TOL1w0BjCkT9kGjHI9tWKDJF2SRfghtPQI9KHJZm1iE=; b=EQ6Ids526TLq9t6kYLBE4fOni2QA0S5nNVi8iLIHQf3p+KD3dGoEog9cEhrq3EW77n nBqCI+6lqvc9iCwhZnczmmhr0+TINo1kTS/BgQOanky6YPvn2gMvjdhGlJB8tHgmtw3u bIj3zvb+wYfXiY4ST74HZYqIrbepNWsVTHhjCgc8D36Fw8+JWBKwOUWV8piuj7hnxc3L FQ/VW5ueg0N96ehK36z2rWk2LbhR/9qJdc43uV/vdG9A8aEOTjitkKGllRo1aVRSkfZZ 0RUKiGyquMNu2KS1iIsSsKMW0jL7NufHFpCXiZEdEmwV/hcWmn+VjMOnk3g591chXmHf asLQ== X-Gm-Message-State: AA+aEWbDOnc/z1TANNW3MsZ7N2NJuBhKyjAog9+UWQthST5ZxmaRhTiB WKEJACjwO0VH0Xh72FDc2MCt/gBh X-Google-Smtp-Source: AFSGD/UYskqImvVcKOPMoKqaP1hzwTuIcrDV7Ym0Iyy1gUoqg5NtAOAUKiM/fEHrL7Ag6fb5SbgA9A== X-Received: by 2002:a1c:8b42:: with SMTP id n63mr10946512wmd.38.1542927979470; Thu, 22 Nov 2018 15:06:19 -0800 (PST) Received: from localhost.localdomain ([91.250.255.197]) by smtp.gmail.com with ESMTPSA id v5sm11099670wrr.11.2018.11.22.15.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 15:06:18 -0800 (PST) From: Paul-Sebastian Ungureanu To: git@vger.kernel.org Cc: t.gummerer@gmail.com Subject: [PATCH v11 08/22] stash: mention options in `show` synopsis Date: Fri, 23 Nov 2018 01:05:28 +0200 Message-Id: <4af795c07883b1e103a8999f4cbe32bd2db0cead.1542925164.git.ungureanupaulsebastian@gmail.com> X-Mailer: git-send-email 2.19.1.878.g0482332a22 In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Mention in the documentation, that `show` accepts any option known to `git diff`. Signed-off-by: Paul-Sebastian Ungureanu --- 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 [] -'git stash' show [] +'git stash' show [] [] 'git stash' drop [-q|--quiet] [] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [] 'git stash' branch [] @@ -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