terminato il ripristino nomi file e relativi riferimenti incrociati

Author: gfedro30

C-git-commands.asc

@@ -19,7 +19,7 @@ The `git config` command has been used in nearly every chapter of the book.
 
 In <<ch01-getting-started#r_first_time>> we used it to specify our name, email address and editor preference before we even got started using Git.
 
-In <<ch02-git-basics#r_git_aliases>> we showed how you could use it to create shorthand commands that expand to long option sequences so you don't have to type them every time.
+In <<ch02-git-basics-chapter#r_git_aliases>> we showed how you could use it to create shorthand commands that expand to long option sequences so you don't have to type them every time.
 
 In <<ch03-git-branching#r_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
 
@@ -44,7 +44,7 @@ There are two ways to get a Git repository. One is to copy it from an existing r
 
 To take a directory and turn it into a new Git repository so you can start version controlling it, you can simply run `git init`.
 
-We first introduce this in <<ch02-git-basics#r_getting_a_repo>>, where we show creating a brand new repository to start working with.
+We first introduce this in <<ch02-git-basics-chapter#r_getting_a_repo>>, where we show creating a brand new repository to start working with.
 
 We talk briefly about how you can change the default branch from ``master'' in <<ch03-git-branching#r_remote_branches>>.
 
@@ -58,7 +58,7 @@ The `git clone` command is actually something of a wrapper around several other
 
 The `git clone` command is used in dozens of places throughout the book, but we'll just list a few interesting places.
 
-It's basically introduced and explained in <<ch02-git-basics#r_git_cloning>>, where we go through a few examples.
+It's basically introduced and explained in <<ch02-git-basics-chapter#r_git_cloning>>, where we go through a few examples.
 
 In <<ch04-git-server#r_git_on_the_server>> we look at using the `--bare` option to create a copy of a Git repository with no working directory.
 
@@ -79,7 +79,7 @@ The `git add` command adds content from the working directory into the staging a
 
 This command is an incredibly important command in Git and is mentioned or used dozens of times in this book. We'll quickly cover some of the unique uses that can be found.
 
-We first introduce and explain `git add` in detail in <<ch02-git-basics#r_tracking_files>>.
+We first introduce and explain `git add` in detail in <<ch02-git-basics-chapter#r_tracking_files>>.
 
 We mention how to use it to resolve merge conflicts in <<ch03-git-branching#r_basic_merge_conflicts>>.
 
@@ -91,13 +91,13 @@ Finally, we emulate it at a low level in <<ch10-git-internals#r_tree_objects>>,
 
 The `git status` command will show you the different states of files in your working directory and staging area. Which files are modified and unstaged and which are staged but not yet committed. In it's normal form, it also will show you some basic hints on how to move files between these stages.
 
-We first cover `status` in <<ch02-git-basics#r_checking_status>>, both in it's basic and simplified forms. While we use it throughout the book, pretty much everything you can do with the `git status` command is covered there.
+We first cover `status` in <<ch02-git-basics-chapter#r_checking_status>>, both in it's basic and simplified forms. While we use it throughout the book, pretty much everything you can do with the `git status` command is covered there.
 
 ==== git diff
 
 The `git diff` command is used when you want to see differences between any two trees. This could be the difference between your working environment and your staging area (`git diff` by itself), between your staging area and your last commit (`git diff --staged`), or between two commits (`git diff master branchB`).
 
-We first look at the basic uses of `git diff` in <<ch02-git-basics#r_git_diff_staged>>, where we show how to see what changes are staged and which are not yet staged.
+We first look at the basic uses of `git diff` in <<ch02-git-basics-chapter#r_git_diff_staged>>, where we show how to see what changes are staged and which are not yet staged.
 
 We use it to look for possible whitespace issues before committing with the `--check` option in <<ch05-distributed-git#r_commit_guidelines>>.
 
@@ -111,15 +111,15 @@ 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.
 
-We only briefly mention this in <<ch02-git-basics#r_git_difftool>>.
+We only briefly mention this in <<ch02-git-basics-chapter#r_git_difftool>>.
 
 ==== git commit
 
 The `git commit` command takes all the file contents that have been staged with `git add` and records a new permanent snapshot in the database and then moves the branch pointer on the current branch up to it.
 
-We first cover the basics of committing in <<ch02-git-basics#r_committing_changes>>. There we also demonstrate how to use the `-a` flag to skip the `git add` step in daily workflows and how to use the `-m` flag to pass a commit message in on the command line instead of firing up an editor.
+We first cover the basics of committing in <<ch02-git-basics-chapter#r_committing_changes>>. There we also demonstrate how to use the `-a` flag to skip the `git add` step in daily workflows and how to use the `-m` flag to pass a commit message in on the command line instead of firing up an editor.
 
-In <<ch02-git-basics#r_undoing>> we cover using the `--amend` option to redo the most recent commit.
+In <<ch02-git-basics-chapter#r_undoing>> we cover using the `--amend` option to redo the most recent commit.
 
 In <<ch03-git-branching#r_git_branches_overview>>, we go into much more detail about what `git commit` does and why it does it like that.
 
@@ -131,7 +131,8 @@ Finally, we take a look at what the `git commit` command does in the background
 
 The `git reset` command is primarily used to undo things, as you can possibly tell by the verb. It moves around the `HEAD` pointer and optionally changes the `index` or staging area and can also optionally change the working directory if you use `--hard`. This final option makes it possible for this command to lose your work if used incorrectly, so make sure you understand it before using it.
 
-We first effectively cover the simplest use of `git reset` in <<ch02-git-basics#r_unstaging>>, where we use it to unstage a file we had run `git add` on.
+We first effectively cover the simplest use of `git reset` in
+<<ch02-git-basics-chapter#r_unstaging>>, where we use it to unstage a file we had run `git add` on.
 
 We then cover it in quite some detail in <<ch07-git-tools#r_git_reset>>, which is entirely devoted to explaining this command.
 
@@ -141,15 +142,15 @@ We use `git reset --hard` to abort a merge in <<ch07-git-tools#r_abort_merge>>,
 
 The `git rm` command is used to remove files from the staging area and working directory for Git. It is similar to `git add` in that it stages a removal of a file for the next commit.
 
-We cover the `git rm` command in some detail in <<ch02-git-basics#r_removing_files>>, including recursively removing files and only removing files from the staging area but leaving them in the working directory with `--cached`.
+We cover the `git rm` command in some detail in <<ch02-git-basics-chapter#r_removing_files>>, including recursively removing files and only removing files from the staging area but leaving them in the working directory with `--cached`.
 
 The only other differing use of `git rm` in the book is in <<ch10-git-internals#r_removing_objects>> where we briefly use and explain the `--ignore-unmatch` when running `git filter-branch`, which simply makes it not error out when the file we are trying to remove doesn't exist. This can be useful for scripting purposes.
 
 ==== git mv
 
 The `git mv` command is a thin convenience command to move a file and then run `git add` on the new file and `git rm` on the old file.
 
-We only briefly mention this command in <<ch02-git-basics#r_git_mv>>.
+We only briefly mention this command in <<ch02-git-basics-chapter#r_git_mv>>.
 
 ==== git clean
 
@@ -211,7 +212,7 @@ The `git log` command is used to show the reachable recorded history of a projec
 
 This command is used in nearly every chapter of the book to demonstrate the history of a project.
 
-We introduce the command and cover it in some depth in <<ch02-git-basics#r_viewing_history>>. There we look at the `-p` and `--stat` option to get an idea of what was introduced in each commit and the `--pretty` and `--oneline` options to view the history more concisely, along with some simple date and author filtering options.
+We introduce the command and cover it in some depth in <<ch02-git-basics-chapter#r_viewing_history>>. There we look at the `-p` and `--stat` option to get an idea of what was introduced in each commit and the `--pretty` and `--oneline` options to view the history more concisely, along with some simple date and author filtering options.
 
 In <<ch03-git-branching#r_create_new_branch>> we use it with the `--decorate` option to easily visualize where our branch pointers are located and we also use the `--graph` option to see what divergent histories look like.
 
@@ -235,7 +236,7 @@ This is basically entirely covered in <<ch07-git-tools#r_git_stashing>>.
 
 The `git tag` command is used to give a permanent bookmark to a specific point in the code history. Generally this is used for things like releases.
 
-This command is introduced and covered in detail in <<ch02-git-basics#r_git_tagging>> and we use it in practice in <<ch05-distributed-git#r_tagging_releases>>.
+This command is introduced and covered in detail in <<ch02-git-basics-chapter#r_git_tagging>> and we use it in practice in <<ch05-distributed-git#r_tagging_releases>>.
 
 We also cover how to create a GPG signed tag with the `-s` flag and verify one with the `-v` flag in <<ch07-git-tools#r_signing>>.
 
@@ -248,7 +249,7 @@ There are not very many commands in Git that access the network, nearly all of t
 
 The `git fetch` command communicates with a remote repository and fetches down all the information that is in that repository that is not in your current one and stores it in your local database.
 
-We first look at this command in <<ch02-git-basics#r_fetching_and_pulling>> and we continue to see examples of it use in <<ch03-git-branching#r_remote_branches>>.
+We first look at this command in <<ch02-git-basics-chapter#r_fetching_and_pulling>> and we continue to see examples of it use in <<ch03-git-branching#r_remote_branches>>.
 
 We also use it in several of the examples in <<ch05-distributed-git#r_contributing_project>>.
 
@@ -260,7 +261,8 @@ We set up highly custom refspecs in order to make `git fetch` do something a lit
 
 The `git pull` command is basically a combination of the `git fetch` and `git merge` commands, where Git will fetch from the remote you specify and then immediately try to merge it into the branch you're on.
 
-We introduce it quicking in <<ch02-git-basics#r_fetching_and_pulling>> and show how to see what it will merge if you run it in <<ch02-git-basics#r_inspecting_remote>>.
+We introduce it quicking in <<ch02-git-basics-chapter#r_fetching_and_pulling>> and
+show how to see what it will merge if you run it in <<ch02-git-basics-chapter#r_inspecting_remote>>.
 
 We also see how to use it to help with rebasing difficulties in <<ch03-git-branching#r_rebase_rebase>>.
 
@@ -272,11 +274,12 @@ Finally, we very quickly mention that you can use the `--verify-signatures` opti
 
 The `git push` command is used to communicate with another repository, calculate what your local database has that the remote one does not, and then pushes the difference into the other repository. It requires write access to the other repository and so normally is authenticated somehow.
 
-We first look at the `git push` command in <<ch02-git-basics#r_pushing_remotes>>. Here we cover the basics of pushing a branch to a remote repository. In <<ch03-git-branching#r_pushing_branches>> we go a little deeper into pushing specific branches and in <<ch03-git-branching#r_tracking_branches>> we see how to set up tracking branches to automatically push to. In <<ch03-git-branching#r_delete_branches>> we use the `--delete` flag to delete a branch on the server with `git push`.
+We first look at the `git push` command in <<ch02-git-basics-chapter#r_pushing_remotes>>. Here we cover the basics of pushing a branch to a remote repository. In <<ch03-git-branching#r_pushing_branches>> we go a little deeper into pushing specific branches and in <<ch03-git-branching#r_tracking_branches>> we see how to set up tracking branches to automatically push to. In <<ch03-git-branching#r_delete_branches>> we use the `--delete` flag to delete a branch on the server with `git push`.
 
 Throughout <<ch05-distributed-git#r_contributing_project>> we see several examples of using `git push` to share work on branches through multiple remotes.
 
-We see how to use it to share tags that you have made with the `--tags` option in <<ch02-git-basics#r_sharing_tags>>.
+We see how to use it to share tags that you have made with the `--tags` option in
+<<ch02-git-basics-chapter#r_sharing_tags>>.
 
 In <<ch07-git-tools#r_publishing_submodules>> we use the `--recurse-submodules` option to check that all of our submodules work has been published before pushing the superproject, which can be really helpful when using submodules.
 
@@ -288,7 +291,7 @@ Finally, in <<ch10-git-internals#r_pushing_refspecs>> we look at pushing with a
 
 The `git remote` command is a management tool for your record of remote repositories. It allows you to save long URLs as short handles, such as ``origin'' so you don't have to type them out all the time. You can have several of these and the `git remote` command is used to add, change and delete them.
 
-This command is covered in detail in <<ch02-git-basics#r_remote_repos>>, including listing, adding, removing and renaming them.
+This command is covered in detail in <<ch02-git-basics-chapter#r_remote_repos>>, including listing, adding, removing and renaming them.
 
 It is used in nearly every subsequent chapter in the book too, but always in the standard `git remote add <name> <url>` format.
 
@@ -310,7 +313,7 @@ This command is only mentioned and entirely covered in <<ch07-git-tools#r_git_su
 
 The `git show` command can show a Git object in a simple and human readable way. Normally you would use this to show the information about a tag or a commit.
 
-We first use it to show annotated tag information in <<ch02-git-basics#r_annotated_tags>>.
+We first use it to show annotated tag information in <<ch02-git-basics-chapter#r_annotated_tags>>.
 
 Later we use it quite a bit in <<ch07-git-tools#r_revision_selection>> to show the commits that our various revision selections resolve to.
 

book/01-introduction/sections/what-is-git.asc

@@ -71,7 +71,7 @@ It is hard to get the system to do anything that is not undoable or to make it e
 As with any VCS, you can lose or mess up changes you haven't committed yet, but after you commit a snapshot into Git, it is very difficult to lose, especially if you regularly push your database to another repository.
 
 This makes using Git a joy because we know we can experiment without the danger of severely screwing things up.
-For a more in-depth look at how Git stores its data and how you can recover data that seems lost, see <<ch02-git-basics-chapter#_undoing>>.
+For a more in-depth look at how Git stores its data and how you can recover data that seems lost, see <<ch02-git-basics-chapter#undoing>>.
 
 ==== The Three States
 

book/03-git-branching/sections/remote-branches.asc

@@ -38,7 +38,9 @@ image::images/remote-branches-3.png[`git fetch` updates your remote references.]
 
 To demonstrate having multiple remote servers and what remote branches for those remote projects look like, let's assume you have another internal Git server that is used only for development by one of your sprint teams.
 This server is at `git.team1.ourcompany.com`.
-You can add it as a new remote reference to the project you're currently working on by running the `git remote add` command as we covered in <<ch02-git-basics#ch02-git-basics>>.
+You can add it as a new remote reference to the project you're currently working
+on by running the `git remote add` command as we covered in
+<<ch02-git-basics-chapter#ch02-git-basics-chapter>>.
 Name this remote `teamone`, which will be your shortname for that whole URL.
 
 .Adding another server as a remote

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

@@ -418,7 +418,8 @@ There are also subcommands to see what will be recorded, to erase specific resol
 
 (((tags)))(((tags, signing)))
 When you've decided to cut a release, you'll probably want to drop a tag so you can re-create that release at any point going forward.
-You can create a new tag as discussed in <<ch02-git-basics#ch02-git-basics>>.
+You can create a new tag as discussed in
+<<ch02-git-basics-chapter#ch02-git-basics-chapter>>.
 If you decide to sign the tag as the maintainer, the tagging may look something like this:
 
 [source,console]

book/06-github/sections/3-maintaining.asc

@@ -24,7 +24,8 @@ All you really have to do here is provide a project name; the rest of the fields
 For now, just click the ``Create Repository'' button, and boom – you have a new repository on GitHub, named `<user>/<project_name>`.
 
 Since you have no code there yet, GitHub will show you instructions for how create a brand-new Git repository, or connect an existing Git project.
-We won't belabor this here; if you need a refresher, check out <<ch02-git-basics#ch02-git-basics>>.
+We won't belabor this here; if you need a refresher, check out
+<<ch02-git-basics-chapter#ch02-git-basics-chapter>>.
 
 Now that your project is hosted on GitHub, you can give the URL to anyone you want to share your project with.
 Every project on GitHub is accessible over HTTP as `https://github.com/<user>/<project_name>`, and over SSH as `git@github.com:<user>/<project_name>`.

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

@@ -219,7 +219,7 @@ If we look at the diagram for that command and think about what `git add` does,
 image::images/reset-path2.png[]
 
 This is why the output of the `git status` command suggests that you run this to unstage a file.
-(See <<ch02-git-basics#r_unstaging>> for more on this.)
+(See <<ch02-git-basics-chapter#r_unstaging>> for more on this.)
 
 We could just as easily not let Git assume we meant ``pull the data from HEAD'' by specifying a specific commit to pull that file version from.
 We would just run something like `git reset eb43bf file.txt`.

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

@@ -721,7 +721,9 @@ Here we can see that we're defining a function in a submodule and calling it in
 
 ===== Useful Aliases
 
-You may want to set up some aliases for some of these commands as they can be quite long and you can't set configuration options for most of them to make them defaults. We covered setting up Git aliases in <<ch02-git-basics#r_git_aliases>>, but here is an example of what you may want to set up if you plan on working with submodules in Git a lot.
+You may want to set up some aliases for some of these commands as they can be
+quite long and you can't set configuration options for most of them to make them
+defaults. We covered setting up Git aliases in <<ch02-git-basics-chapter#r_git_aliases>>, but here is an example of what you may want to set up if you plan on working with submodules in Git a lot.
 
 [source,console]
 ----

book/08-customizing-git/sections/config.asc

@@ -141,7 +141,9 @@ $ git tag -s <tag-name>
 ===== `core.excludesfile`
 
 (((excludes)))(((.gitignore)))
-You can put patterns in your project's `.gitignore` file to have Git not see them as untracked files or try to stage them when you run `git add` on them, as discussed in <<ch02-git-basics#r_ignoring>>.
+You can put patterns in your project's `.gitignore` file to have Git not see them
+as untracked files or try to stage them when you run `git add` on them, as
+discussed in <<ch02-git-basics-chapter#r_ignoring>>.
 
 But sometimes you want to ignore certain files for all repositories that you work with.
 If your computer is running Mac OS X, you're probably familiar with `.DS_Store` files.