Skip to content

Appendix Final #89

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

Merged
ben merged 27 commits into from
Oct 21, 2014
Merged

Appendix Final #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d44c85e
add small section on git difftool
schacon Oct 8, 2014
e8224cb
log, stash and tag
schacon Oct 9, 2014
4a33d46
plumbing section and flesh out the rest of the commands
schacon Oct 9, 2014
0c0da3e
manual remerge link
schacon Oct 9, 2014
2671a49
fetch and pull
schacon Oct 9, 2014
e86fc25
Embedding: intro edits
ben Oct 13, 2014
beccdc4
JGit: setup and plumbing
ben Oct 13, 2014
652bccb
forgot to add these xlinks
schacon Oct 13, 2014
2fb691d
push, remote and submodule
schacon Oct 13, 2014
0cce6a4
inspection and comparison
schacon Oct 13, 2014
a5033d3
debug and started on patching
schacon Oct 13, 2014
ea4fa23
rebase
schacon Oct 13, 2014
e65216b
revert
schacon Oct 13, 2014
8215864
am, format-patch, send-email and request-pull
schacon Oct 13, 2014
38a302d
svn, import
schacon Oct 13, 2014
c460106
rest of the commands
schacon Oct 13, 2014
57eb252
add git to the subsections
schacon Oct 13, 2014
96ba7db
Merge remote-tracking branch 'origin/master' into appendix-final
schacon Oct 13, 2014
45cc896
Porcelain
ben Oct 14, 2014
a923fcf
Further reading
ben Oct 17, 2014
f66e5d5
Tweaks
ben Oct 17, 2014
645ea37
Expand Libgit2 content
ben Oct 19, 2014
25b2ad0
Extended Rugged example
ben Oct 19, 2014
87a3648
ODB backends part I
ben Oct 20, 2014
659ef40
Feedback
ben Oct 20, 2014
d9db713
More custom ODB backend content
ben Oct 21, 2014
d3e1176
Libgit2 tweaks
ben Oct 21, 2014
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
Next Next commit
add small section on git difftool
  • Loading branch information
@schacon
schacon committed Oct 8, 2014
commit d44c85e3381a2fd3df94d5555b9a634b2f79da05
7 changes: 7 additions & 0 deletions book/02-git-basics/sections/recording-changes.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,13 @@ index 3cb747f..e445e28 100644
log.size
----

[[_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.
====

[[_committing_changes]]
==== Committing Your Changes

Expand Down
3 changes: 1 addition & 2 deletions book/C-git-commands/1-git-commands.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ Finally, we use it to effectively compare submodule changes with `--submodule` i

The `git difftool` command simply launches an external tool to show you the difference between two trees in case you want to use something other than the built in `git diff` command.

TODO: We don't ever cover this, lol.

We only briefly mention this in <<_git_difftool>>.

==== git commit

Expand Down