git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nico -telmich- Schottelius <nico-git-20080606@schottelius.org>
To: git@vger.kernel.org
Subject: How to compare different files in different branches
Date: Fri, 6 Jun 2008 14:24:21 +0200	[thread overview]
Message-ID: <20080606122421.GA1521@denkbrett.schottelius.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1288 bytes --]

Hello!

I want to compare 'configure.in' from the master branch with
'configure.ac' from the gpm-2-dev branch.

What I tried:

% git-diff master..gpm-2-dev configure.ac                
fatal: ambiguous argument 'configure.ac': unknown revision or path not
in the working tree.
Use '--' to separate paths from revisions

# ok, correct, there is no configure.ac in master
# But not what I want.

% git-diff master..gpm-2-dev configure.in

# shows that the file does not exist in gpm-2-dev. Correct.
# But not what I want.

Strange ist: 
% git-diff --summary master...gpm-2-dev
and
% git-diff --stat master...gpm-2-dev
do not show the rename.

But using

% git log -Sconfigure gpm-2-dev

I find the rename in commit 5fe49d36d775af47c08bb9a0c0beabef609bba20.

Now I could do 

% git-checkout master configure.in

in the gpm-2-dev branch and manually compare it with diff.
But - you guessed it - is not what I want.

I really think git can do that, but currently I do not see the right
way. So any idea on how to do that?

Sincerly

Nico

P.S.: Please cc on reply.

-- 
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/

PGP: BFE4 C736 ABE5 406F 8F42  F7CF B8BE F92A 9885 188C

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2008-06-06 12:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-06 12:24 Nico -telmich- Schottelius [this message]
2008-06-06 12:30 ` How to compare different files in different branches Jonathan del Strother
2008-06-06 12:34 ` Jakub Narebski
2008-06-06 12:38   ` Jakub Narebski
2008-06-06 12:35 ` Teemu Likonen
2008-06-08  9:47   ` Nico -telmich- Schottelius
2008-06-08  9:51     ` Junio C Hamano
2008-06-15  1:49       ` Ask Bjørn Hansen
2008-06-16 12:21       ` git-svn breaks svn when adding .svn Nico -telmich- Schottelius
     [not found]         ` <200806161603.05166.thomas@koch.ro>
2008-06-16 16:09           ` Frederik Dohr

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=20080606122421.GA1521@denkbrett.schottelius.org \
    --to=nico-git-20080606@schottelius.org \
    --cc=git@vger.kernel.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).