Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 17:36: Michael J Gruber g...@drmicha.warpmail.net 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

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Jeff King
On Mon, Feb 04, 2013 at 08:36:43AM -0800, Junio C Hamano wrote: 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. For what else, other than showing textual diff, do you think I told you that for? and replacing

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Ævar Arnfjörð Bjarmason
On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano gits...@pobox.com wrote: 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. For what else, other than showing textual diff, do you think I told you that for? and

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Jeff King
On Tue, Feb 05, 2013 at 11:16:52AM +0100, Ævar Arnfjörð Bjarmason wrote: On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano gits...@pobox.com wrote: 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. For what

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Junio C Hamano
Jeff King p...@peff.net writes: git log --cc --stat the --cc is significant. So I don't think it is right for --cc to always imply -p. But if the rule kicked in only when no other format had been specified, that might make sense. Yes, it was my mistake that I left it unsaid. Obviously

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason ava...@gmail.com writes: On a related note then, it's a bit confusing that it's called --full-diff when it doesn't actually show a diff. It is too late to change the name of the option, but we could add a synonym if it makes easier to understand what the option is for.

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-04 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 00:10: I think a natural way to ask reviewing the recent merges while showing tricky ones would be to say: $ git log --first-parent --cc master..pu But this does not to show what I expect to see, which is an output of: $ git log

Re: [RFC] Should log --cc imply log --cc -p?

2013-02-04 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net 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