#git-diff

In the same vein as diffing UTF-16 .strings files in git:

It's easy to set up git to show diffs for binary .plist files.

Add a textconv key for this conversion to your ~/.gitconfig:

git config --global diff.plist.textconv "plutil -convert xml1 -o -"

In your global .gitconfig, it'll look like this:

[diff "plist"] textconv = plutil -convert xml1 -o -

Add a mapping from filename to diff command to your project's .gitattributes file:

echo "*.plist diff=plist" >> .gitattributes

(Bonus points) Set up a global .gitattributes file via this Q&A on Stack Overflow to always do this:

git config --global core.attributesfile $HOME/.gitattributes echo "*.plist diff=plist" >> ~/.gitattributes

What this looks like in practice:

Fixed Show git diff on file in staging area #dev #it #asnwer

Show git diff on file in staging area

Possible Duplicate: How do I show the changes which have been staged?

Is there a way I can see the changes that were made to a file after I have done git add file?

That is, when I do:

git add file git diff file

no diff is shown. I guess there’s a way to see the differences since the last commit but I don’t know what that is.

Answer: Show git diff on file in…

How to: git-diff to ignore ^M

git-diff to ignore ^M

In a project where some of the files contains ^M as newline separators. Diffing these files are apparently impossible, since git-diff sees it as the entire file is just a single line.

How does one diff with the previous version?

Is there an option like “treat ^M as newline when diffing” ?

prompt> git-diff "HEAD^" MyFile.as diff git a/myproject/MyFile.as…

Fixed Git: how to diff the same file between two different commits on the same branch? #dev #it #asnwer

Git: how to diff the same file between two different commits on the same branch?

On git, how could I compare the same file between two different commits (not contiguous) on the same branch (master for example)?

I’m searching for a Compare feature like the one in VSS or TFS, is it possible in Git?

Answer: Git: how to diff the same file between two different commits on the same branch?

$ git diff…

Fixed Comparing two branches in GIT? #dev #it #asnwer

Comparing two branches in GIT?

I have two branches, branch_1 and branch_2.

I want to see the differences between the two branches in Git.

Answer: Comparing two branches in GIT?

git diff branch_1..branch_2

That will produce the diff between the tips of the two branches. If you’d prefer to find the diff from their common ancestor to test, you can use three dots instead of two:

git diff…

Fixed Show all changed files between two Git commits #dev #it #asnwer

Show all changed files between two Git commits

I have a bunch of commits in the repo. I want to see a list of files changed between two commits – from SHA1 to SHA2.

What command should I use?

Answer: Show all changed files between two Git commits

git diff name-only SHA1 SHA2

where you only need to include enough of the SHA to identify the commits. You can also do, for example

git diff name-only…

How to: Show git diff on file in staging area

Show git diff on file in staging area

Possible Duplicate: How do I show the changes which have been staged?

Is there a way I can see the changes that were made to a file after I have done git add file?

That is, when I do:

git add file git diff file

no diff is shown. I guess there’s a way to see the differences since the last commit but I don’t know what that is.

Answer: Show git diff on file in…

How to: Show git diff on file in staging area

Show git diff on file in staging area

Possible Duplicate: How do I show the changes which have been staged?

Is there a way I can see the changes that were made to a file after I have done git add file?

That is, when I do:

git add file git diff file

no diff is shown. I guess there’s a way to see the differences since the last commit but I don’t know what that is.

Answer: Show git diff on file in…