Getting the difference between two repositories

Question

How can we get the difference between two git repositories   The scenario  We have a repo a and repo b  The latter was created as a copy of repo a  There have been parallel development in both the repositories afterwards  Is there a way we can list the differences of the current versions of these two repositories

User · Answer

See http   git or cz gitwiki GitTips  section  How to compare two local repositories  in  General      In short you are using GIT ALTERNATE OBJECT DIRECTORIES environment variable to have access to object database of the other repository  and using git rev-parse with --git-dir   GIT DIR to convert symbolic name in other repository to SHA-1 identifier   Modern version would look something like this  assuming that you are in  repo a      GIT ALTERNATE OBJECT DIRECTORIES    repo b  git objects      git diff   git --git-dir    repo b  git rev-parse --verify HEAD  HEAD   where    repo b  git is path to object database in repo b  it would be repo b git if it were bare repository    Of course you can compare arbitrary versions  not only HEADs     Note that if repo a and repo b are the same repository  it might make more sense to put both of them in the same repository  either using  git remote add -f      to create nickname s  for repository for repeated updates  or obe off  git fetch       as described in other responses

User · Answer

I use PyCharm which has great capabilities to compare between folders and files   Just open the parent folder for both repos and wait until it indexes  Then you can use right click on a folder or file and Compare to    and pick the corresponding folder   file on the other side   It shows not only what files are different but also their content   Much easier than command line

User · Answer

You can add other repo first as a remote to your current repo   git remote add other name PATH TO OTHER REPO   then fetch brach from that remote   git fetch other name branch name branch name   this creates that branch as a new branch in your current repo  then you can diff that branch with any of your branches  for example  to compare current branch against new branch branch name    git diff branch name

User · Answer

In repo a   git remote add -f b path to repo b git git remote update git diff master remotes b master git remote rm b

User · Answer

An easy way to do that without touching your remotes config  From repo A  in master  assume you want to compare master branches    git fetch path to repo b git master git diff FETCH HEAD

User · Answer

Meld can compare directories   meld directory1 directory2   Just use the directories of the two git repos and you will get a nice graphical comparison     When you click on one of the blue items  you can see what changed

User · Answer

Your best bet is to have both repos on your local machine and use the linux diff command with the two directories as parameters   diff -r repo-A repo-B

User · Answer

You can use the following command   diff -x  git -r repo-A repo-B   or for the side by side you can use   diff -x  git -W200 -y -r repo-A repo-B   In case of Colorizing every diff file  you can use   diff -x  git -W200 -y -r repo-A repo-B   sed -e  s    diff       x1b 31m 1 x1b 0m

User · Answer

Once you have both branches in one repository you can do a git diff  And getting them in one repository is as easy as  git fetch  the other repo  git refs heads   refs remotes other

User · Answer

git diff master remotes b   That s incorrect  remotes b is a remote  but not a branch   To get it to work  I had to do   git diff master remotes b master

User · Answer

Reminder to self    fetch first  else the repository has not local hash  I guess    step 1  Setup the upstream remote and above   diffing a single file follows this pattern    git diff localBranch uptreamBranch --spacepath singlefile  git diff master upstream nameofrepo -- src index js

[git] Getting the difference between two repositories

Examples related to git

Examples related to git-diff