Linus Torvalds [off-list ref] writes:
On Fri, 20 Oct 2006, Junio C Hamano wrote:
quoted
There is another one similar to the gitweb one you mentioned:
git-show --stat on a merge. We deliberately chose to show the
difference from the first parent; it is called "showing the
changes the person who made this merge saw".
Well, that one actually makes sense. It's just the stat from the previous
state, after all, and it actually is done _together_ with the operation
that causes the diffs.
So that one I don't think you can really even claim.
Also, it's not even the "first parent". Look closer. It's literally
"previous state", because it does so for a fast-forward too. It's from
ORIG_HEAD.
I was not talking about "git pull". I was talking about "git
show".
On Fri, 20 Oct 2006, Junio C Hamano wrote:
I was not talking about "git pull". I was talking about "git
show".
Duh. I don't know why I misread that.
Yeah, that makes no sense at all. I _think_ "git show" should be the same
thing as a single-entry "git log -p".
Linus
Linus Torvalds wrote:
On Fri, 20 Oct 2006, Junio C Hamano wrote:
quoted
I was not talking about "git pull". I was talking about "git
show".
Duh. I don't know why I misread that.
Yeah, that makes no sense at all. I _think_ "git show" should be the same
thing as a single-entry "git log -p".
Huh?
$ git show ff49fae6a547e5c70117970e01c53b64d983cd10
commit ff49fae6a547e5c70117970e01c53b64d983cd10
Merge: 7ad4ee7... 75f9007... 14eab2b... 0b35995... eee4609...
[...]
diff --cc Makefile
index 36b9e06,68ae43b,66c8b4b,66c8b4b,09f60bb..a2f2f7c
[...]
"git show" doesn't prefer first parent: it uses compact combined
(that is the meaning of --cc, isn't it?) format for merges.
git version 1.4.2.1
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git