Junio C Hamano venit, vidit, dixit 04.02.2013 17:36:
> Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> writes:
>
>> But diffs are on here ("-p"), it's just that the default diff option for
>> merges is to not display them. Well, I admit there's two different ways
>> of thinking here:
>>
>> A) "git log -p" turns on diffs for all commits, and the default diff
>> options is the (non-existing) "--no-show" diff-option for merges.
>>
>> B) "git log -p" applies "-p" to all commits except merge commits.
>>
>> I'm strongly in the A camp,...
>
> I can personally be trained to think either way, but I suspect that
> we already came halfway to
>
> C) "-p" asks for two-way patches, and "-c/--cc" ask for n-way
> patches (including but not limited to n==2); it is not that -p
> asks for patch generation and others modify the finer behaviour
> of patch generation.
>
> "git log/diff-files -U8" do not need "-p" to enable textual patches,
> for example. It is "I already told you that I want 8-line context.
That's a good point that I wasn't aware of.
> For what else, other than showing textual diff, do you think I told
> you that for?" and replacing "8-line context" with various other
> options that affect patch generation will give us a variety of end
> user complaints that would tell us that C) is more intuitive to
> them.
>
> But I do not feel very strongly that I am *right* on this issue, so
> I won't do anything about it hastily right now.
I'm not sure how many of these we have already, but to me it indicates
that we should turn diffs on for log with any diff option that only
makes sense with a diff. That would make the ui more consistent without
taking anything away.
For scripting/aliasing purposes, we have "-s" in order to override any
implied "-p" (as I just learned).
Michael
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html