0
votes
0answers
16 views

Colorize only the changes and not the complete line in diff

I have to very similar files which usually only differ in the capitalization. Currently I'm using the default diff but seeing the actual difference can be hard. For example I compare files only ...
0
votes
1answer
157 views

How can I diff binary files in git?

I assume I need to set up a difftool. What difftools work? How do you put the parameters in?
0
votes
1answer
36 views

How am I supposed to use diff in this situation?

I recently asked a Google Groups forum for help with setting up a Vagrant/Chef/Django VM thingamajigger, and I received the following help: The fabfile.py had some errors for me. After I fixed ...
0
votes
1answer
280 views

git difftool doesn't launch Beyond Compare from Powershell or command prompt

I'm trying to use Beyond Compare 3 as my diff tool with git. I configured git with the following commands: (source: Using Beyond Compare With Version Control Systems) git config --global diff.tool ...
9
votes
3answers
1k views

How can I enable colored output for OSX diff?

I need to diff two files (not two versions of the same file, they are however tracked by git, but that is unrelated) and I would like some colored output, how can I achieve that? $ diff file_1 file_2 ...
0
votes
1answer
44 views

How to see what's changed on git

A bunch of new commits have been made on the remote git repository, and you want to see what's changed from the version you have checked out on your computer previously. How do you do so?
1
vote
1answer
1k views

why doesn't my .gitconfig work? (for external diff)

I added this in ~/.gitconfig: [diff] external = mvimdiff [difftool] prompt = false and made a 755 /bin/mvimdiff that: #!/bin/sh mvim -d "$2" "$5" in order to invoke MacVim as my git ...
1
vote
1answer
218 views

Show git diff HEAD~1 of file not touched in recent commits

In Git, to see the differences with a previous commit I run this: git diff HEAD~1 To see the commits related with a single file I would run this: git log --oneline file But if I run the ...
5
votes
2answers
776 views

Vimdiff and git all at once

I use vimdiff as my difftool with git. Let's say that I've changed twelve files. The problem is that sometimes I run git diff and around the fourth or fifth file I see something that I want to ...
3
votes
2answers
2k views

Comparing a folder with a git repository

I have a folder now once exported from a git repository, and the git repository itself: / /now/ /repository.git/ I'd like to compare the files in now to the current state of the repository. While ...