git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH 5/7] git-log.txt: generalize <since>..<until>
Date: Sun, 21 Apr 2013 11:54:33 -0700	[thread overview]
Message-ID: <7va9oru32u.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1366534252-12099-6-git-send-email-artagnon@gmail.com> (Ramkumar Ramachandra's message of "Sun, 21 Apr 2013 14:20:50 +0530")

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> '<since>..<until>' is misleading, as there are many other forms that
> 'git log' can accept as an argument.  Replace it with <revision range>,
> referring to the section "Specifying Ranges" in revisions.txt, and
> rewrite the section appropriately.
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  Documentation/git-log.txt | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
> index 64cc337..c238475 100644
> --- a/Documentation/git-log.txt
> +++ b/Documentation/git-log.txt
> @@ -9,7 +9,7 @@ git-log - Show commit logs
>  SYNOPSIS
>  --------
>  [verse]
> -'git log' [<options>] [<since>..<until>] [[\--] <path>...]
> +'git log' [<options>] [<revision range>] [[\--] <path>...]
>  
>  DESCRIPTION
>  -----------
> @@ -62,12 +62,14 @@ produced by --stat etc.
>  	Note that only message is considered, if also a diff is shown
>  	its size is not included.
>  
> -<since>..<until>::
> -	Show only commits between the named two commits.  When
> -	either <since> or <until> is omitted, it defaults to
> -	`HEAD`, i.e. the tip of the current branch.
> -	For a more complete list of ways to spell <since>
> -	and <until>, see linkgit:gitrevisions[7].
> +<revision range>::
> +	Show only commits in the specified revision range.  When no
> +	<revision range> is specified, it defaults to 'HEAD' (ie. the

s/ie/i.e./; or s/ie/meaning /;

> +	whole history leading to the current commit).  master..HEAD
> +	specifies all the commits reachable from 'HEAD', but not from
> +	'master'. For a complete list of ways to spell
> +	<revision range>, see the "Specifying Ranges" section of
> +	linkgit:gitrevisions[7].

If you want to have a single example (other than 'HEAD' which has to
be there anyway to describe the default), I think it would be more
helpful to use one that would be common for not-so-advanced users,
e.g. "origin..HEAD", without many other prerequisites (e.g. "@{u}.."
may be common among more advanced users but is not appropriate here,
because the reader may not have learned @{upstream} or omission of a
side of a range defaulting to HEAD).

	... `origin..HEAD` specifies all the commits reachable from
	the current commit (i.e. `HEAD`) but not from `origin`.

I could squash these in locally without a reroll, but I haven't read
the remainder of the series yet, so we'll see.

>  [\--] <path>...::
>  	Show only commits that are enough to explain how the files

  reply	other threads:[~2013-04-21 18:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-21  8:50 [PATCH v2 0/7] Documentation/shortlog improvements Ramkumar Ramachandra
2013-04-21  8:50 ` [PATCH 1/7] git-shortlog.txt: remove (-h|--help) from OPTIONS Ramkumar Ramachandra
2013-04-21  8:50 ` [PATCH 2/7] builtin/shortlog.c: make usage string consistent with log Ramkumar Ramachandra
2013-04-21  8:50 ` [PATCH 3/7] revisions.txt: clarify the .. and ... syntax Ramkumar Ramachandra
2013-04-21  8:50 ` [PATCH 4/7] git-log.txt: order OPTIONS properly; move <since>..<until> Ramkumar Ramachandra
2013-04-21  8:50 ` [PATCH 5/7] git-log.txt: generalize <since>..<until> Ramkumar Ramachandra
2013-04-21 18:54   ` Junio C Hamano [this message]
2013-04-21  8:50 ` [PATCH 6/7] git-log.txt: rewrite note on why "--" may be required Ramkumar Ramachandra
2013-04-21  8:50 ` [PATCH 7/7] git-shortlog.txt: make SYNOPSIS match log, update OPTIONS Ramkumar Ramachandra
2013-04-21 19:06   ` Junio C Hamano

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=7va9oru32u.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    /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).