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

Re: How to compare different files in different branches

From
TLTeemu Likonen <tlikonen@iki.fi>
Date
Jun 6, 2008, 12:35 UTC
Message-ID
<20080606123539.GA3119@mithlond.arda.local>
In-Reply-To
<20080606122421.GA1521@denkbrett.schottelius.org>
Nico -telmich- Schottelius wrote (2008-06-06 14:24 +0200):
> I want to compare 'configure.in' from the master branch with
> 'configure.ac' from the gpm-2-dev branch.
You could do:
  $ git diff master:configure.in gpm-2-dev:configure.ac
In general form it means:
  $ git diff <commit1>:<path1> <commit2>:<path2>
You can also view directories and files similar way:
  $ git show <commit>:<path>

And <commit> can be anything that refers to a commit, e.g. a branch name, a tag, SHA1 or a relative pointer like master^2~5.

Previous: Jakub NarebskiNext: Nico -telmich- Schottelius
Message 5 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.