From: "Colin S. Miller" <no-spam-thank-you@csmiller.demon.co.uk>
To: help-gnu-emacs@gnu.org
Subject: Re: ediff against branch with git
Date: Tue, 02 Jun 2009 20:56:38 +0100 [thread overview]
Message-ID: <4a2583f4$0$90271$14726298@news.sunsite.dk> (raw)
In-Reply-To: <mailman.8365.1243956425.31690.help-gnu-emacs@gnu.org>
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.
next parent reply other threads:[~2009-06-02 19:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <mailman.8365.1243956425.31690.help-gnu-emacs@gnu.org>
2009-06-02 19:56 ` Colin S. Miller [this message]
2009-06-03 7:47 ` ediff against branch with git Martin
2009-06-03 9:52 ` George Nurser
2009-06-02 15:26 George Nurser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='4a2583f4$0$90271$14726298@news.sunsite.dk' \
--to=no-spam-thank-you@csmiller.demon.co.uk \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.