VCS comparison table
Jakub Narebski
jnareb at gmail.com
Fri Oct 20 16:34:58 BST 2006
Johannes Schindelin wrote:
> On Fri, 20 Oct 2006, Jakub Narebski wrote:
>
>> Jeff King wrote:
>>>
>>> I was accustomed to doing such things in CVS, but I find the git way
>>> much more pleasant, since I don't have to do any arithmetic:
>>> diff d8a60^..d8a60
>>
>> By the way "diff d8a60" also works (unless d8a60 is merge commit, in
>> which case you would need "diff -c d8a60" or "diff -m d8a60").
>
> I could be wrong, but I have the impression (even after actually testing
> it) that "git diff d8a60" is equivalent to "git diff d8a60..HEAD", _not_
> "git diff d8a60^..d8a60".
Ooops, I mixed git-diff-tree (which behaves as mentioned above) with
git-diff, which according to documentation compares with working tree
(and not HEAD) if only one <tree-ish> is given.
git-diff(1):
? When one <tree-ish> is given, the working tree and the named tree are
compared, using git-diff-index. The option --cached can be given to com-
pare the index file and the named tree.
git-diff-tree(1):
If there is only one <tree-ish> given, the commit is compared with its par-
ents (see --stdin below).
--
Jakub Narebski
Poland
More information about the bazaar
mailing list