git/list[1] front-page[2] threads[3] people[4] search[5] about
 

How to compare different files in different branches

From
NSNico -telmich- Schottelius <nico-git-20080606@schottelius.org>
Date
Jun 6, 2008, 12:24 UTC
Message-ID
<20080606122421.GA1521@denkbrett.schottelius.org>
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
Next: Jonathan del Strother
Message 1 of 10 in “How to compare different files in different branches”
  1. Nico -telmich- SchotteliusJun 6, 2008
  2. Jonathan del StrotherJun 6, 2008
  3. Jakub NarebskiJun 6, 2008
  4. Jakub NarebskiJun 6, 2008
  5. Teemu LikonenJun 6, 2008
  6. Nico -telmich- SchotteliusJun 8, 2008
  7. Junio C HamanoJun 8, 2008
  8. Ask Bjørn HansenJun 15, 2008
  9. git-svn breaks svn when adding .svnNico -telmich- Schottelius, Jun 16, 2008
  10. Frederik DohrJun 16, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.