public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jakub Narebski <jnareb@gmail•com>
To: Jeff King <peff@peff•net>
Cc: "Gonzalo Garramuño" <ggarra@advancedsl•com.ar>, git@vger•kernel.org
Subject: Re: git-diff across branches?
Date: Tue, 08 Jan 2008 02:01:35 -0800 (PST)	[thread overview]
Message-ID: <m3wsqkmy22.fsf@roke.D-201> (raw)
In-Reply-To: <20080108085705.GA4222@sigill.intra.peff.net>

Jeff King <peff@peff•net> writes:

> On Tue, Jan 08, 2008 at 05:44:14AM -0300, Gonzalo Garramuño wrote:
> 
> > I was wondering if there was a way to make a git-diff across (local)  
> > branches.
> >
> > Something like:
> >
> > $ git-diff --branch test1 HEAD --branch test2 HEAD  file.cpp
> > (would show a diff for file.cpp between test1 HEAD and test2 HEAD)
> 
> I think you are mistaken about how HEAD works; it is a pointer to a
> particular branch. So there is no "HEAD" for test1; there is simply
> test1, and from time to time your repository's HEAD points to test1.
> 
> However, that makes things easier. You can simply do this:
> 
>   git-diff test1 test2 file.cpp

Canonically it is

  # git diff test1 test2 -- file.cpp

but you can also use (for example if file was renamed)

  # git diff test1:file.cpp test2:file.cpp
 
> Unless you mean that you have two separate repositories, test1 and
> test2. In which case each _does_ have its own HEAD, and you will have to
> fetch from one repo into the other to get your answer:
[cut]

Not necessary. If those two repositories are on the same local
filesystem, you can use trick from GitTips:

  http://git.or.cz/gitwiki/GitTips#head-9f79516c05f0c1b51945b848adb3dd1c5a2bf016

  (assuming we are in test1, and ../test2 is relative path to test2)
  # GIT_ALTERNATE_OBJECT_DIRECTORIES=../test2/.git/objects git diff-tree \
     $(GIT_DIR=../test2/.git git rev-parse --verify HEAD) HEAD

-- 
Jakub Narebski
Poland
ShadeHawk on #git

     prev parent reply	other threads:[~2008-01-08 10:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-08  8:44 git-diff across branches? Gonzalo Garramuño
2008-01-08  8:57 ` Jeff King
2008-01-08 10:01   ` Jakub Narebski [this message]

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=m3wsqkmy22.fsf@roke.D-201 \
    --to=jnareb@gmail$(echo .)com \
    --cc=ggarra@advancedsl$(echo .)com.ar \
    --cc=git@vger$(echo .)kernel.org \
    --cc=peff@peff$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox