Best “diff” utility?

I was noticing two files were containing the same information earlier and I wanted to compare them. Without thinking I did a diff on them. Then I got to thinking there must be more visual diffs. Git for instance. With all the diffs they do their it must be very nice. Unfortunately when I looked at git diff it seemed to only work for versions of the same file. If this is not the case please correct me. I then tried vimdiff. It’s nice but the default color scheme is not workable and I did not want to spend an hour playing with it. (Why don’t the vim folk make a nice little popup that lets you modify colors easily. DUH!) So then I used sdiff. sdiff seems to work most intuitively but it’s ancient.

Anybody have better solutions?

My GIT Tutorial For Ubuntu: PART 2

How do you push your changes to a new remote repository if you created the local repository with “git init”? Most developers probably start their projects using git on their local hard disk. When it comes time to making a remote repository for other people to pull from do the following:

Make a bare bone git repository on the server and then push to it from the head of your local repository:

ssh your-user@www.your-server.com
mkdir -p ~/some-path/…/…/your-repo.git
cd ~/some-path/…/…/your-repo.git
git –bare init
exit

cd your-local-git-repository
git remote add origin your-user@www.your-server.com:some-path/…/…/your-repo.git
git push origin master

Notice the syntax of the “remote add”. There is no “ssh://” as shown in some tutorials. And it’s important to avoid hard coding the path on the remote server by using the colon. If you get a
“fatal: ‘your-repo.git’ does not appear to be a git repository“
error when doing the push you can remove the origin with the command “git remote rm orgin” and continue trying the add until you get it right.

Notes:

1. You probably need to set up your ssh keys first as described in a past post here.
2. The first part of this git tutorial started here.