Re: VCS comparison table
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Oct 21, 2006, 08:32 UTC
- Message-ID
- <ehcluh$v3e$2@sea.gmane.org>
- In-Reply-To
- <Pine.LNX.4.64.0610201854350.3962@g5.osdl.org>
Linus Torvalds wrote:
Show 9 quoted lines
> 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".
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