Hi,
I am wondering what is the best way to show the change introduced by a commit. In the other words, is there a better way to do this:
git-diff b163512d4eb36ee946908b682c7863658c5a8db4^ b163512d4eb36ee946908b682c7863658c5a8db4
Thanks. Robertoo
Petr BaudisRe: command to show diff of a commit
Dear diary, on Thu, Sep 22, 2005 at 11:58:32AM CEST, I got a letter where Robert Watson <robert.oo.watson@gmail.com> told me that...
> Hi,
Hi,
Show 5 quoted lines
> I am wondering what is the best way to show the change introduced by a > commit. In the other words, is there a better way to do this: > > git-diff b163512d4eb36ee946908b682c7863658c5a8db4^ > b163512d4eb36ee946908b682c7863658c5a8db4
with Cogito, you would say
cg-diff -p -r b163512d4eb36ee946908b682c7863658c5a8db4
to see the diff against its parent. (You should still choose the parent manually in case of merge commits.)
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.
Re: command to show diff of a commit
On 9/22/05, Petr Baudis <pasky@suse.cz> wrote:
Show 19 quoted lines
> Dear diary, on Thu, Sep 22, 2005 at 11:58:32AM CEST, I got a letter > where Robert Watson <robert.oo.watson@gmail.com> told me that... > > Hi, > > Hi, > > > I am wondering what is the best way to show the change introduced by a > > commit. In the other words, is there a better way to do this: > > > > git-diff b163512d4eb36ee946908b682c7863658c5a8db4^ > > b163512d4eb36ee946908b682c7863658c5a8db4 > > with Cogito, you would say > > cg-diff -p -r b163512d4eb36ee946908b682c7863658c5a8db4 > > to see the diff against its parent. (You should still choose the parent > manually in case of merge commits.) >
Thanks, it is nice to know that cogito can go it. But can I achieve the same with git-core only?
Thanks, Robertoo
Re: command to show diff of a commit
On Thu, Sep 22, 2005 at 03:25:01PM +0100, Robert Watson wrote:
Show 11 quoted lines
> On 9/22/05, Petr Baudis <pasky@suse.cz> wrote: > > Dear diary, on Thu, Sep 22, 2005 at 11:58:32AM CEST, I got a letter > > > I am wondering what is the best way to show the change introduced by a > > > commit. In the other words, is there a better way to do this: > > > > > > git-diff b163512d4eb36ee946908b682c7863658c5a8db4^ > > > b163512d4eb36ee946908b682c7863658c5a8db4 > > > Thanks, it is nice to know that cogito can go it. But can I achieve > the same with git-core only? >
I suppose this is slightly shorter:
git-whatchanged --max-count=1 -p b163512d4eb36ee946908b682c7863658c5a8db4
skimo
Linus TorvaldsRe: command to show diff of a commit
On Thu, 22 Sep 2005, Robert Watson wrote:
Show 6 quoted lines
> > I am wondering what is the best way to show the change introduced by a > commit. In the other words, is there a better way to do this: > > git-diff b163512d4eb36ee946908b682c7863658c5a8db4^ > b163512d4eb36ee946908b682c7863658c5a8db4
Oh, absolutely.
Do
git-diff-tree -p --pretty b163512d4eb36ee946908b682c7863658c5a8db4
and you're done.
If you _just_ want the diff (and not the message), skip the "--pretty".
Linus
Re: command to show diff of a commit
On 9/22/05, Linus Torvalds <torvalds@osdl.org> wrote:
Show 22 quoted lines
> > > On Thu, 22 Sep 2005, Robert Watson wrote: > > > > I am wondering what is the best way to show the change introduced by a > > commit. In the other words, is there a better way to do this: > > > > git-diff b163512d4eb36ee946908b682c7863658c5a8db4^ > > b163512d4eb36ee946908b682c7863658c5a8db4 > > Oh, absolutely. > > Do > > git-diff-tree -p --pretty b163512d4eb36ee946908b682c7863658c5a8db4 > > and you're done. > > If you _just_ want the diff (and not the message), skip the "--pretty". > > Linus >
Many thanks. I know there must be a way to do this.
Here is a patch to make the document a bit clearer.
Regards, Robertoo
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -9,12 +9,15 @@ git-diff-tree - Compares the content and SYNOPSIS -------- -'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> <tree-ish> [<path>...] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] DESCRIPTION ----------- Compares the content and mode of the blobs found via two tree objects. +If there is only one <tree-ish> given, the commit is compared with its parents +(see --stdin below). + Note that "git-diff-tree" can use the tree encapsulated in a commit object. OPTIONS