Skip to content

Commit 3d50cb4

Browse files
committed
Correção de links e âncoras quebrados.
1 parent fb72382 commit 3d50cb4

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

C-git-commands.asc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ We first introduce this in <<ch02-git-basics-chapter#_getting_a_repo>>, where we
9999

100100
We talk briefly about how you can change the default branch name from "`master`" in <<ch03-git-branching#_remote_branches>>.
101101

102-
We use this command to create an empty bare repository for a server in <<ch04-git-on-the-server#_bare_repo>>.
102+
We use this command to create an empty bare repository for a server in <<ch04-git-on-the-server#r_bare_repo>>.
103103

104104
Finally, we go through some of the details of what it actually does behind the scenes in <<ch10-git-internals#_plumbing_porcelain>>.
105105

@@ -161,7 +161,7 @@ We use it to look for possible whitespace issues before committing with the `--c
161161

162162
We see how to check the differences between branches more effectively with the `git diff A...B` syntax in <<ch05-distributed-git#_what_is_introduced>>.
163163

164-
We use it to filter out whitespace differences with `-b` and how to compare different stages of conflicted files with `--theirs`, `--ours` and `--base` in <<ch07-git-tools#_advanced_merging>>.
164+
We use it to filter out whitespace differences with `-b` and how to compare different stages of conflicted files with `--theirs`, `--ours` and `--base` in <<ch07-git-tools#r_advanced_merging>>.
165165

166166
Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#_starting_submodules>>.
167167

@@ -196,7 +196,7 @@ We first effectively cover the simplest use of `git reset` in <<ch02-git-basics-
196196

197197
We then cover it in quite some detail in <<ch07-git-tools#_git_reset>>, which is entirely devoted to explaining this command.
198198

199-
We use `git reset --hard` to abort a merge in <<ch07-git-tools#_abort_merge>>, where we also use `git merge --abort`, which is a bit of a wrapper for the `git reset` command.
199+
We use `git reset --hard` to abort a merge in <<ch07-git-tools#r_abort_merge>>, where we also use `git merge --abort`, which is a bit of a wrapper for the `git reset` command.
200200

201201
==== git rm
202202

@@ -261,7 +261,7 @@ Though it is used in various places in the book, there are very few variations o
261261

262262
We covered how to do a squashed merge (where Git merges the work but pretends like it's just a new commit without recording the history of the branch you're merging in) at the very end of <<ch05-distributed-git#_public_project>>.
263263

264-
We went over a lot about the merge process and command, including the `-Xignore-space-change` command and the `--abort` flag to abort a problem merge in <<ch07-git-tools#_advanced_merging>>.
264+
We went over a lot about the merge process and command, including the `-Xignore-space-change` command and the `--abort` flag to abort a problem merge in <<ch07-git-tools#r_advanced_merging>>.
265265

266266
We learned how to verify signatures before merging if your project is using GPG signing in <<ch07-git-tools#_signing_commits>>.
267267

@@ -395,7 +395,7 @@ This command is only mentioned and entirely covered in <<ch07-git-tools#_git_sub
395395
The `git show` command can show a Git object in a simple and human readable way.
396396
Normally you would use this to show the information about a tag or a commit.
397397

398-
We first use it to show annotated tag information in <<ch02-git-basics-chapter#_annotated_tags>>.
398+
We first use it to show annotated tag information in <<ch02-git-basics-chapter#r_annotated_tags>>.
399399

400400
Later we use it quite a bit in <<ch07-git-tools#_revision_selection>> to show the commits that our various revision selections resolve to.
401401

book/B-embedding-git/sections/jgit.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Ref objects are also used to represent tag refs and objects, so you can ask if t
9797

9898
The second line gets the target of the `master` reference, which is returned as an ObjectId instance.
9999
ObjectId represents the SHA-1 hash of an object, which might or might not exist in Git's object database.
100-
The third line is similar, but shows how JGit handles the rev-parse syntax (for more on this, see <<ch07-git-tools#_branch_references>>); you can pass any object specifier that Git understands, and JGit will return either a valid ObjectId for that object, or `null`.
100+
The third line is similar, but shows how JGit handles the rev-parse syntax (for more on this, see <<ch07-git-tools#r_branch_references>>); you can pass any object specifier that Git understands, and JGit will return either a valid ObjectId for that object, or `null`.
101101

102102
The next two lines show how to load the raw contents of an object.
103103
In this example, we call `ObjectLoader.copyTo()` to stream the contents of the object directly to stdout, but ObjectLoader also has methods to read the type and size of an object, as well as return it as a byte array.

book/B-embedding-git/sections/libgit2.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The `git_repository` type represents a handle to a repository with a cache in me
3535
This is the simplest method, for when you know the exact path to a repository's working directory or `.git` folder.
3636
There's also the `git_repository_open_ext` which includes options for searching, `git_clone` and friends for making a local clone of a remote repository, and `git_repository_init` for creating an entirely new repository.
3737

38-
The second chunk of code uses rev-parse syntax (see <<ch07-git-tools#_branch_references>> for more on this) to get the commit that HEAD eventually points to.
38+
The second chunk of code uses rev-parse syntax (see <<ch07-git-tools#r_branch_references>> for more on this) to get the commit that HEAD eventually points to.
3939
The type returned is a `git_object` pointer, which represents something that exists in the Git object database for a repository.
4040
`git_object` is actually a "`parent`" type for several different kinds of objects; the memory layout for each of the "`child`" types is the same as for `git_object`, so you can safely cast to the right one.
4141
In this case, `git_object_type(commit)` would return `GIT_OBJ_COMMIT`, so it's safe to cast to a `git_commit` pointer.

0 commit comments

Comments
 (0)