git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zack Brown <zacharyb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Using "git log" to find the files patched at the same time as a  named file
Date: Wed, 3 Feb 2010 16:52:36 -0500	[thread overview]
Message-ID: <218b69371002031352je066f5cvd87025459fade368@mail.gmail.com> (raw)
In-Reply-To: <7vfx5idmt2.fsf@alter.siamese.dyndns.org>

That looks much clearer. But I would change the final sentence to,
"This option lifts that limit and tells "git log" to include changes
from all paths that were affected by the outputted commits, not just
the changes from the paths specified on the command line."

Be well,
Zack

On Wed, Feb 3, 2010 at 4:36 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Zack Brown <zacharyb@gmail.com> writes:
>
>> ... What about something like this:
>>
>> "Without this flag, "git log -p <path>..." shows commits that touch
>> the specified paths, but it only includes the diffs from those commits
>
> I would say "s/but/and/", because it is more natural that you get the
> "limited" view after you explicitly stated that you are "only interested
> in these things" by giving pathspecs.
>
>> that affected those specified paths, regardless of whether other paths
>> were changed in those same commits. With "git log --full-diff -p
>> <path>...", git still only reports commits that touch the specified
>> path, but now it also includes the diffs that affected any other paths
>> changed in those same commits."
>
> And "but" on the second line from the bottom makes sense---by giving the
> option, you are telling it to work differently.
>
>> Would that be an improvement?
>
> Surely.  I would suspect that people would go even further.  "-p" is not
> very special (notice I used --name-status in my example).
>
> Also I think the description should start with what it _does_, not with
> what happens without it.
>
> So how about this?
>
> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
> index 0e39bb6..5dd1c0c 100644
> --- a/Documentation/git-log.txt
> +++ b/Documentation/git-log.txt
> @@ -49,11 +49,14 @@ include::diff-options.txt[]
>        commit was reached.
>
>  --full-diff::
> -       Without this flag, "git log -p <path>..." shows commits that
> -       touch the specified paths, and diffs about the same specified
> -       paths.  With this, the full diff is shown for commits that touch
> -       the specified paths; this means that "<path>..." limits only
> -       commits, and doesn't limit diff for those commits.
> +       Show all changes, even outside the given pathspecs.
> ++
> +Pathspecs <path>... given to "git log [<options>] <path>..."  limit the
> +output to the commits that touch the specified paths.  When options to
> +show changes introduced by these commits (e.g. "-p", "--name-only") are
> +given, the output of the changes are also limited to the specified paths.
> +This option lifts the latter limit and tells "git log" to include all
> +changes, even the ones outside of the given pathspecs.
>
>  --follow::
>        Continue listing the history of a file beyond renames.
>
>
>



-- 
Zack Brown

      reply	other threads:[~2010-02-03 21:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-03 20:38 Using "git log" to find the files patched at the same time as a named file Zack Brown
2010-02-03 20:52 ` Junio C Hamano
2010-02-03 21:14   ` Zack Brown
2010-02-03 21:36     ` Junio C Hamano
2010-02-03 21:52       ` Zack Brown [this message]

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=218b69371002031352je066f5cvd87025459fade368@mail.gmail.com \
    --to=zacharyb@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).