mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Documentation: wording fixes in the user manual and glossary
Re-word the section on "Updating a repository with git fetch" in the user manual. Various other minor fixes in the manual and glossary. Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4a28f169ad
commit
3c735e0776
|
@ -1,7 +1,7 @@
|
||||||
[[def_alternate_object_database]]alternate object database::
|
[[def_alternate_object_database]]alternate object database::
|
||||||
Via the alternates mechanism, a <<def_repository,repository>>
|
Via the alternates mechanism, a <<def_repository,repository>>
|
||||||
can inherit part of its <<def_object_database,object database>>
|
can inherit part of its <<def_object_database,object database>>
|
||||||
from another object database, which is called "alternate".
|
from another object database, which is called an "alternate".
|
||||||
|
|
||||||
[[def_bare_repository]]bare repository::
|
[[def_bare_repository]]bare repository::
|
||||||
A bare repository is normally an appropriately
|
A bare repository is normally an appropriately
|
||||||
|
|
|
@ -416,12 +416,11 @@ REVISIONS" section of linkgit:gitrevisions[7].
|
||||||
Updating a repository with git fetch
|
Updating a repository with git fetch
|
||||||
------------------------------------
|
------------------------------------
|
||||||
|
|
||||||
Eventually the developer cloned from will do additional work in her
|
After you clone a repository and commit a few changes of your own, you
|
||||||
repository, creating new commits and advancing the branches to point
|
may wish to check the original repository for updates.
|
||||||
at the new commits.
|
|
||||||
|
|
||||||
The command `git fetch`, with no arguments, will update all of the
|
The `git-fetch` command, with no arguments, will update all of the
|
||||||
remote-tracking branches to the latest version found in her
|
remote-tracking branches to the latest version found in the original
|
||||||
repository. It will not touch any of your own branches--not even the
|
repository. It will not touch any of your own branches--not even the
|
||||||
"master" branch that was created for you on clone.
|
"master" branch that was created for you on clone.
|
||||||
|
|
||||||
|
@ -1811,8 +1810,8 @@ manner.
|
||||||
You can then import these into your mail client and send them by
|
You can then import these into your mail client and send them by
|
||||||
hand. However, if you have a lot to send at once, you may prefer to
|
hand. However, if you have a lot to send at once, you may prefer to
|
||||||
use the linkgit:git-send-email[1] script to automate the process.
|
use the linkgit:git-send-email[1] script to automate the process.
|
||||||
Consult the mailing list for your project first to determine how they
|
Consult the mailing list for your project first to determine
|
||||||
prefer such patches be handled.
|
their requirements for submitting patches.
|
||||||
|
|
||||||
[[importing-patches]]
|
[[importing-patches]]
|
||||||
Importing patches to a project
|
Importing patches to a project
|
||||||
|
@ -2255,7 +2254,7 @@ $ git checkout test && git merge speed-up-spinlocks
|
||||||
It is unlikely that you would have any conflicts here ... but you might if you
|
It is unlikely that you would have any conflicts here ... but you might if you
|
||||||
spent a while on this step and had also pulled new versions from upstream.
|
spent a while on this step and had also pulled new versions from upstream.
|
||||||
|
|
||||||
Some time later when enough time has passed and testing done, you can pull the
|
Sometime later when enough time has passed and testing done, you can pull the
|
||||||
same branch into the `release` tree ready to go upstream. This is where you
|
same branch into the `release` tree ready to go upstream. This is where you
|
||||||
see the value of keeping each patch (or patch series) in its own branch. It
|
see the value of keeping each patch (or patch series) in its own branch. It
|
||||||
means that the patches can be moved into the `release` tree in any order.
|
means that the patches can be moved into the `release` tree in any order.
|
||||||
|
|
Loading…
Reference in a new issue