Skip to content

Commit

Permalink
Merge branch 'epub-fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
schacon committed Dec 8, 2014
2 parents 1e802bb + b4f62e0 commit 84d3caa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion book/02-git-basics/sections/recording-changes.asc
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ index 8ebb991..643e24f 100644
that highlights your work in progress (and note in the PR title that it's
----

[NOTE]
[[_git_difftool]]
[NOTE]
.Git Diff in an External Tool
====
We will continue to use the `git diff` command in various ways throughout the rest of the book. There is another way to look at these diffs if you prefer a graphical or external diff viewing program instead. If you run `git difftool` instead of `git diff`, you can view any of these diffs in software like Araxis, emerge, vimdiff and more. Run `git difftool --tool-help` to see what is available on your system.
Expand Down

0 comments on commit 84d3caa

Please sign in to comment.