How to compare different files in different branches

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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: signature.asc
Description: Digital signature


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux