ediff against branch with git

ediff against branch with git

[George Nurser]

Hi,
I was hoping to able to use ediff to compare the versions of a given
file on two git branches. I couldn't see anyway to do it though. I
have Emacs v23, with the standard version control package, and the
latest version from the git repository of git-emacs.

Am I missing something? Or is there another package that will do this?

--George Nurser.

Re: ediff against branch with git

[Colin S. Miller]

George Nurser wrote:
> Hi,
> I was hoping to able to use ediff to compare the versions of a given
> file on two git branches. I couldn't see anyway to do it though. I
> have Emacs v23, with the standard version control package, and the
> latest version from the git repository of git-emacs.
> 
> Am I missing something? Or is there another package that will do this?
> 
> --George Nurser.
> 
> 
Hi George,
I don't use git,  but using cvs-mode,
the most obvious way to do it would to use
C-u d e   <ediff in cvs>
and add -R<branch-tag> -R<other-branch-tag> to the CVS command.

This might work in git's CVS compatibility mode.

HTH,
Colin S. Miler


-- 
Replace the obvious in my email address with the first three letters of the hostname to reply.

Re: ediff against branch with git

[Martin]

George Nurser writes:

> Hi,
> I was hoping to able to use ediff to compare the versions of a given
> file on two git branches. I couldn't see anyway to do it though. I
> have Emacs v23, with the standard version control package, and the
> latest version from the git repository of git-emacs.
>
> Am I missing something? Or is there another package that will do this?
>
> --George Nurser.

Hi,

do you know about ediff-revision ?

Martin
--
parozusa at web dot de

Re: ediff against branch with git

[George Nurser]

I knew about ediff-revision, but didn't realise that it could take a
branch name in the selection dialogue.

Thanks very much!

George.

2009/6/3 Martin <nospam@nospam.net>:
>
> George Nurser writes:
>
>> Hi,
>> I was hoping to able to use ediff to compare the versions of a given
>> file on two git branches. I couldn't see anyway to do it though. I
>> have Emacs v23, with the standard version control package, and the
>> latest version from the git repository of git-emacs.
>>
>> Am I missing something? Or is there another package that will do this?
>>
>> --George Nurser.
>
> Hi,
>
> do you know about ediff-revision ?
>
> Martin
> --
> parozusa at web dot de
>