Skip to content

Commit 80bd744

Browse files
committed
Fix double definitions of xrefs
1 parent 8ab4c05 commit 80bd744

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

C-git-commands.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ We use it to reintroduce file conflicts with `--conflict=diff3` in <<ch07-git-to
205205

206206
We go into closer detail on its relationship with `git reset` in <<ch07-git-tools#_git_reset>>.
207207

208-
Finally, we go into some implementation detail in <<ch10-git-internals#_the_head>>.
208+
Finally, we go into some implementation detail in <<ch10-git-internals#ref_the_ref>>.
209209

210210
==== git merge
211211

@@ -417,7 +417,7 @@ Rebasing is covered in detail in <<ch03-git-branching#_rebasing>>, including cov
417417

418418
We use it in practice during an example of splitting your history into two separate repositories in <<ch07-git-tools#_replace>>, using the `--onto` flag as well.
419419

420-
We go through running into a merge conflict during rebasing in <<ch07-git-tools#_rerere>>.
420+
We go through running into a merge conflict during rebasing in <<ch07-git-tools#ref_rerere>>.
421421

422422
We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#_changing_multiple>>.
423423

@@ -533,7 +533,7 @@ There were also quite a number of lower level plumbing commands that we encounte
533533

534534
The first one we encounter is `ls-remote` in <<ch06-github#_pr_refs>> which we use to look at the raw references on the server.
535535

536-
We use `ls-files` in <<ch07-git-tools#_manual_remerge>>, <<ch07-git-tools#_rerere>> and <<ch07-git-tools#_the_index>> to take a more raw look at what your staging area looks like.
536+
We use `ls-files` in <<ch07-git-tools#_manual_remerge>>, <<ch07-git-tools#ref_rerere>> and <<ch07-git-tools#_the_index>> to take a more raw look at what your staging area looks like.
537537

538538
We also mention `rev-parse` in <<ch07-git-tools#_branch_references>> to take just about any string and turn it into an object SHA-1.
539539

book/05-distributed-git/sections/maintaining.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ Now, whenever you do a merge that resolves conflicts, the resolution will be rec
422422
If you need to, you can interact with the rerere cache using the `git rerere` command.
423423
When it's invoked alone, Git checks its database of resolutions and tries to find a match with any current merge conflicts and resolve them (although this is done automatically if `rerere.enabled` is set to `true`).
424424
There are also subcommands to see what will be recorded, to erase specific resolution from the cache, and to clear the entire cache.
425-
We will cover rerere in more detail in <<ch07-git-tools#_rerere>>.
425+
We will cover rerere in more detail in <<ch07-git-tools#ref_rerere>>.
426426

427427
[[_tagging_releases]]
428428
==== Tagging Your Releases

book/07-git-tools/sections/rerere.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[[_rerere]]
1+
[[ref_rerere]]
22
=== Rerere
33

44
The `git rerere` functionality is a bit of a hidden feature.

book/10-git-internals/sections/refs.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ image::images/data-model-4.png[Git directory objects with branch head references
6464

6565
When you run commands like `git branch <branch>`, Git basically runs that `update-ref` command to add the SHA-1 of the last commit of the branch you're on into whatever new reference you want to create.
6666

67-
[[_the_head]]
67+
[[ref_the_ref]]
6868
==== The HEAD
6969

7070
The question now is, when you run `git branch <branch>`, how does Git know the SHA-1 of the last commit?

0 commit comments

Comments
 (0)