From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Sun, 13 Nov 2005 20:42:31 GMT
Subject: Re: [PATCH] GIT commit statistics.
Message-ID: <46a038f90511131242p4692c74fn20c015998620b9f4@mail.gmail.com>
In-Reply-To: <7vy83s95k0.fsf@assigned-by-dhcp.cox.net>

On 11/13/05, Junio C Hamano <junkio@cox.net> wrote:
> Ah, the commit master~3 was what he had the last time I pulled
> from him, and since then he made a commit while I did three.  I
> could do "git pull . origin" at this point, but that would
> result in a useless mini-merge.  My tree is not public so I can
> freely rebase to clean things up.
>
>         $ git rebase origin
>         $ git show-branch

What happens if there are conflicts during git-rebase? I'm thinking of
adding an '-r' option to cg-update that will rebase instead of
merging, if the rebase is clean.

Is there a cheap way to ask from a shell script whether the merge is
truly trivial? I thought git-diff-tree would help me here, but it
doesn't...


martin