Merge branch 'mr/doc-can-not-to-cannot'
Docfix. * mr/doc-can-not-to-cannot: doc: typo: s/can not/cannot/ and s/is does/does/maint
commit
68c1ac4a0b
|
@ -17,7 +17,7 @@ linkgit:git-receive-pack[1]. On the fetch side, malformed objects will
|
||||||
instead be left unreferenced in the repository.
|
instead be left unreferenced in the repository.
|
||||||
+
|
+
|
||||||
Due to the non-quarantine nature of the `fetch.fsckObjects`
|
Due to the non-quarantine nature of the `fetch.fsckObjects`
|
||||||
implementation it can not be relied upon to leave the object store
|
implementation it cannot be relied upon to leave the object store
|
||||||
clean like `receive.fsckObjects` can.
|
clean like `receive.fsckObjects` can.
|
||||||
+
|
+
|
||||||
As objects are unpacked they're written to the object store, so there
|
As objects are unpacked they're written to the object store, so there
|
||||||
|
|
|
@ -232,7 +232,7 @@ write so it might not be enough to grant the users using
|
||||||
'git-cvsserver' write access to the database file without granting
|
'git-cvsserver' write access to the database file without granting
|
||||||
them write access to the directory, too.
|
them write access to the directory, too.
|
||||||
|
|
||||||
The database can not be reliably regenerated in a
|
The database cannot be reliably regenerated in a
|
||||||
consistent form after the branch it is tracking has changed.
|
consistent form after the branch it is tracking has changed.
|
||||||
Example: For merged branches, 'git-cvsserver' only tracks
|
Example: For merged branches, 'git-cvsserver' only tracks
|
||||||
one branch of development, and after a 'git merge' an
|
one branch of development, and after a 'git merge' an
|
||||||
|
|
|
@ -262,7 +262,7 @@ This updates (or creates, as necessary) branches `pu` and `tmp` in
|
||||||
the local repository by fetching from the branches (respectively)
|
the local repository by fetching from the branches (respectively)
|
||||||
`pu` and `maint` from the remote repository.
|
`pu` and `maint` from the remote repository.
|
||||||
+
|
+
|
||||||
The `pu` branch will be updated even if it is does not fast-forward,
|
The `pu` branch will be updated even if it does not fast-forward,
|
||||||
because it is prefixed with a plus sign; `tmp` will not be.
|
because it is prefixed with a plus sign; `tmp` will not be.
|
||||||
|
|
||||||
* Peek at a remote's branch, without configuring the remote in your local
|
* Peek at a remote's branch, without configuring the remote in your local
|
||||||
|
@ -285,7 +285,7 @@ BUGS
|
||||||
----
|
----
|
||||||
Using --recurse-submodules can only fetch new commits in already checked
|
Using --recurse-submodules can only fetch new commits in already checked
|
||||||
out submodules right now. When e.g. upstream added a new submodule in the
|
out submodules right now. When e.g. upstream added a new submodule in the
|
||||||
just fetched commits of the superproject the submodule itself can not be
|
just fetched commits of the superproject the submodule itself cannot be
|
||||||
fetched, making it impossible to check out that submodule later without
|
fetched, making it impossible to check out that submodule later without
|
||||||
having to do a fetch again. This is expected to be fixed in a future Git
|
having to do a fetch again. This is expected to be fixed in a future Git
|
||||||
version.
|
version.
|
||||||
|
|
|
@ -249,7 +249,7 @@ BUGS
|
||||||
----
|
----
|
||||||
Using --recurse-submodules can only fetch new commits in already checked
|
Using --recurse-submodules can only fetch new commits in already checked
|
||||||
out submodules right now. When e.g. upstream added a new submodule in the
|
out submodules right now. When e.g. upstream added a new submodule in the
|
||||||
just fetched commits of the superproject the submodule itself can not be
|
just fetched commits of the superproject the submodule itself cannot be
|
||||||
fetched, making it impossible to check out that submodule later without
|
fetched, making it impossible to check out that submodule later without
|
||||||
having to do a fetch again. This is expected to be fixed in a future Git
|
having to do a fetch again. This is expected to be fixed in a future Git
|
||||||
version.
|
version.
|
||||||
|
|
|
@ -255,7 +255,7 @@ This commit is referred to as a "merge commit", or sometimes just a
|
||||||
[[def_object]]object::
|
[[def_object]]object::
|
||||||
The unit of storage in Git. It is uniquely identified by the
|
The unit of storage in Git. It is uniquely identified by the
|
||||||
<<def_SHA1,SHA-1>> of its contents. Consequently, an
|
<<def_SHA1,SHA-1>> of its contents. Consequently, an
|
||||||
object can not be changed.
|
object cannot be changed.
|
||||||
|
|
||||||
[[def_object_database]]object database::
|
[[def_object_database]]object database::
|
||||||
Stores a set of "objects", and an individual <<def_object,object>> is
|
Stores a set of "objects", and an individual <<def_object,object>> is
|
||||||
|
|
|
@ -54,7 +54,7 @@ this:
|
||||||
do not do this you will get an error for each ref that it does not point
|
do not do this you will get an error for each ref that it does not point
|
||||||
to a valid object.
|
to a valid object.
|
||||||
|
|
||||||
Note: As a side-effect of this you can not safely assume that all
|
Note: As a side-effect of this you cannot safely assume that all
|
||||||
objects you lookup are available in superproject. All submodule objects
|
objects you lookup are available in superproject. All submodule objects
|
||||||
will be available the same way as the superprojects objects.
|
will be available the same way as the superprojects objects.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue