git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org, gitster@pobox.com
Cc: stefanbeller@googlemail.com, Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH 0/5] Make "git show -s" easier to discover for users
Date: Mon, 15 Jul 2013 15:07:14 +0200	[thread overview]
Message-ID: <1373893639-13413-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <vpqa9lof2e4.fsf@anie.imag.fr>

> Stefan Beller <stefanbeller@googlemail.com> writes:
>
>> However I sometimes also get:
>> sb@sb:~/OSS/git$ git show --format="%ad" 0da7a53
>> Fri Jul 12 10:49:34 2013 -0700
>>
>> diff --git a/Documentation/RelNotes/1.8.4.txt
>> b/Documentation/RelNotes/1.8.4.txt
>> index 0e50df8..4250e5a 100644
>> --- a/Documentation/RelNotes/1.8.4.txt
>> +++ b/Documentation/RelNotes/1.8.4.txt
>
> "git show" will show the diff by default. For merge commits, it shows
> the --cc diff which is often empty, hence the behavior you see.
>
> You want to use "git show -s", which suppresses the patch output.

... and this "git show -s" is extraordinarily hard to discover, as it
is only documented in "git log --help". Google has been my friend
here, but we should really improve that.

This patch series does essentially two things:

* Add a --no-patch synonym for -s. I'm actually wondering why the
  option wasn't called this way from the beginning.

* Reorganize the doc so that "git show" actually mentions it.

While we're there, there's a reformatting patch, and one to make "git
log --no-patch --patch" actually show the patch.

(60aa9cf8f3, Documentation: document show -s, Tue Nov 9 11:12:48 2010
actually acknowledged that the documentation wasn't complete and that
something else was needed, this should be it)

Matthieu Moy (5):
  diff: allow --no-patch as synonym for -s
  diff: allow --patch to override -s/--no-patch
  Documentation/git-show.txt: include common diff options, like
    git-log.txt
  Documentation: move description of -s, --no-patch to diff-options.txt
  Documentation/git-log.txt: capitalize section names

 Documentation/diff-options.txt     | 5 +++++
 Documentation/git-log.txt          | 8 ++++----
 Documentation/git-show.txt         | 9 +++++++++
 Documentation/rev-list-options.txt | 3 ---
 diff.c                             | 7 ++++---
 5 files changed, 22 insertions(+), 10 deletions(-)

-- 
1.8.3.1.495.g13f33cf.dirty

  parent reply	other threads:[~2013-07-15 13:12 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-15 11:25 Bug in "git show"? Stefan Beller
2013-07-15 12:12 ` Matthieu Moy
2013-07-15 12:23   ` Stefan Beller
2013-07-15 13:07   ` Matthieu Moy [this message]
2013-07-15 13:07     ` [PATCH 1/5] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-15 13:07     ` [PATCH 2/5] diff: allow --patch to override -s/--no-patch Matthieu Moy
2013-07-15 15:02       ` Junio C Hamano
2013-07-15 15:28         ` Matthieu Moy
2013-07-15 16:40           ` Junio C Hamano
2013-07-15 17:05             ` [PATCH v2 0/5] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-15 17:05               ` [PATCH v2 1/5] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-15 17:35                 ` Jonathan Nieder
2013-07-15 17:55                   ` [PATCH v3 0/6] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-15 17:55                     ` [PATCH v3 1/6] t4000-diff-format.sh: modernize style Matthieu Moy
2013-07-15 18:00                       ` Jonathan Nieder
2013-07-15 17:55                     ` [PATCH v3 2/6] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-15 17:55                     ` [PATCH v3 3/6] diff: allow --patch & cie to override -s/--no-patch Matthieu Moy
2013-07-15 18:09                       ` Jonathan Nieder
2013-07-15 18:23                         ` Matthieu Moy
2013-07-15 18:58                           ` Jonathan Nieder
2013-07-16  8:05                             ` [PATCH v4 0/6] Make "git show -s" easier to discover for users Matthieu Moy
2013-07-16  8:05                               ` [PATCH v4 1/6] t4000-diff-format.sh: modernize style Matthieu Moy
2013-07-16  8:05                               ` [PATCH v4 2/6] diff: allow --no-patch as synonym for -s Matthieu Moy
2013-07-16  8:05                               ` [PATCH v4 3/6] diff: allow --patch & cie to override -s/--no-patch Matthieu Moy
2013-07-16  8:05                               ` [PATCH v4 4/6] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-16  8:05                               ` [PATCH v4 5/6] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-16  8:05                               ` [PATCH v4 6/6] Documentation/git-log.txt: capitalize section names Matthieu Moy
2013-07-16 17:46                               ` [PATCH v4 0/6] Make "git show -s" easier to discover for users Jonathan Nieder
2013-07-16 18:07                                 ` Stefan Beller
2013-07-18  0:51                               ` Junio C Hamano
2013-07-15 17:55                     ` [PATCH v3 4/6] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-15 17:55                     ` [PATCH v3 5/6] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-15 17:55                     ` [PATCH v3 6/6] Documentation/git-log.txt: capitalize section names Matthieu Moy
2013-07-15 18:17                       ` Jonathan Nieder
2013-07-15 17:05               ` [PATCH v2 2/5] diff: allow --patch & cie to override -s/--no-patch Matthieu Moy
2013-07-15 17:05               ` [PATCH v2 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-15 17:05               ` [PATCH v2 4/5] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-15 17:05               ` [PATCH v2 5/5] Documentation/git-log.txt: capitalize section names Matthieu Moy
2013-07-15 13:07     ` [PATCH 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt Matthieu Moy
2013-07-15 14:54       ` Junio C Hamano
2013-07-15 15:06         ` Junio C Hamano
2013-07-15 13:07     ` [PATCH 4/5] Documentation: move description of -s, --no-patch to diff-options.txt Matthieu Moy
2013-07-15 13:07     ` [PATCH 5/5] Documentation/git-log.txt: capitalize section names Matthieu Moy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373893639-13413-1-git-send-email-Matthieu.Moy@imag.fr \
    --to=matthieu.moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=stefanbeller@googlemail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).