Skip to content

Commit

Permalink
Documentation: fix typos and spelling in replace documentation
Browse files Browse the repository at this point in the history
This patch fix a missing "s" at the end of an occurence of
"--no-replace-objects" and, while at it, it also improves spelling
and rendering.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Nov 21, 2009
1 parent 6476b38 commit ddae8ae
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions Documentation/git-replace.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,32 @@ DESCRIPTION
Adds a 'replace' reference in `.git/refs/replace/`

The name of the 'replace' reference is the SHA1 of the object that is
replaced. The content of the replace reference is the SHA1 of the
replaced. The content of the 'replace' reference is the SHA1 of the
replacement object.

Unless `-f` is given, the replace reference must not yet exist in
Unless `-f` is given, the 'replace' reference must not yet exist in
`.git/refs/replace/` directory.

Replace references will be used by default by all git commands except
those doing reachability traversal (prune, pack transfer and fsck).
Replacement references will be used by default by all git commands
except those doing reachability traversal (prune, pack transfer and
fsck).

It is possible to disable use of replacement refs for any command
using the --no-replace-objects option just after "git".
It is possible to disable use of replacement references for any
command using the `--no-replace-objects` option just after 'git'.

For example if commit "foo" has been replaced by commit "bar":
For example if commit 'foo' has been replaced by commit 'bar':

------------------------------------------------
$ git --no-replace-object cat-file commit foo
$ git --no-replace-objects cat-file commit foo
------------------------------------------------

show information about commit "foo", while:
shows information about commit 'foo', while:

------------------------------------------------
$ git cat-file commit foo
------------------------------------------------

show information about commit "bar".
shows information about commit 'bar'.

OPTIONS
-------
Expand Down

0 comments on commit ddae8ae

Please sign in to comment.