Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README.md with note on GUIs for diff #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update README.md with note on GUIs for diff #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,20 @@ git log specificFile.txt
# show the commit for specificFile.txt

git diff
# see what actually has changed
# see what actually has changed inside each file

```

#### git diff

The `git diff` tool is very handy, because it shows you a before-and-after comparison of how the current files differ from those in the last commit.
But by default it uses a cryptic line-by-line text format.
Fortunatly there are GUIs for doing this kind of comparison, and one freely available cross-platform tool is Meld.
It can be conveniently installed on Mac OS X via [HomeBrew](http://brew.sh) with the following command:

brew install meld

To set it up with git, follow the instructions in <http://blog.deadlypenguin.com/blog/2011/05/03/using-meld-with-git-diff/>

## Using Git with a Remote Server

Expand Down