From: Teemu Likonen <tlikonen@iki.fi>
Date: Fri, 06 Jun 2008 12:35:39 GMT
Subject: Re: How to compare different files in different branches
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.