Re: VCS comparison table
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Oct 20, 2006, 12:01 UTC
- Message-ID
- <200610201401.33676.jnareb@gmail.com>
- In-Reply-To
- <a7e835d40610200345o2ad83bb7k6dfc29867498971c@mail.gmail.com>
James Henstridge wrote:
Show 16 quoted lines
> On 20/10/06, Jakub Narebski <jnareb@gmail.com> wrote: > > > What's nice is being able see the revno 753 and knowing that "diff -r > > > 752..753" will show the changes it introduced. Checking the revo on a > > > branch mirror and knowing how out-of-date it is. > > > > Huh? If you want what changes have been introduced by commit > > c3424aebbf722c1f204931bf1c843e8a103ee143, you just do > > > > # git diff c3424aebbf722c1f204931bf1c843e8a103ee143 > > > > (or better "git show" instead of "git diff" or "git diff-tree"). > > If you give only one commit (only one revision) git automatically > > gives diff to its parent(s). > > If a revision has multiple parents, what does it diff against in this > case? Do you get one diff against each parent revision?
If revision has multiple parents (is merge commit), git-diff (which is used by git-show) does not show differences (unless you give two revisions in git-diff case).
You can either use '-m' option to show differences from all its parents, or '-c'/'--cc' to show combined diff ('--cc' shows more compact diff).
-- Jakub Narebski Poland