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
Prev Previous commit
Next Next commit
forgot to add these xlinks
  • Loading branch information
@schacon
schacon committed Oct 13, 2014
commit 652bccb03bed35d5e44b077077fdb20edec4491b
1 change: 1 addition & 0 deletions book/02-git-basics/sections/remotes.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ If you and someone else clone at the same time and they push upstream and then y
You'll have to pull down their work first and incorporate it into yours before you'll be allowed to push.
See <<_git_branching>> for more detailed information on how to push to remote servers.

[[_inspecting_remote]]
==== Inspecting a Remote

If you want to see more information about a particular remote, you can use the `git remote show [remote-name]` command.(((git commands, remote)))
Expand Down
1 change: 1 addition & 0 deletions book/05-distributed-git/sections/contributing.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[[_contributing_project]]
=== Contributing to a Project

(((contributing)))
Expand Down