fix various doc typos
Signed-off-by: Junio C Hamano <junkio@cox.net>
Michael Coleman committed
Feb 28, 2007 at 23:14 UTC
20f50f1670c18173d74a34527b0c538c3fbbfde3
3 files changed
+6
-6
Documentation/RelNotes-1.5.1.txt
+1
-1
@@ -50,7 +50,7 @@ Updates since v1.5.0
50
LF at the end of lines. Currently, which paths to consider
51
'text' (i.e. be subjected to the autocrlf mechanism) is
52
decided purely based on the contents, but the plan is to
53
- allow users to explicitly override this heuristics based on
53
+ allow users to explicitly override this heuristic based on
54
paths.
55
56
- The behaviour of 'git-apply', when run in a subdirectory,
Documentation/git-bundle.txt
+4
-4
@@ -19,7 +19,7 @@ DESCRIPTION
19
Some workflows require that one or more branches of development on one
20
machine be replicated on another machine, but the two machines cannot
21
be directly connected so the interactive git protocols (git, ssh,
22
-rsync, http) cannot be used. This command provides suport for
22
+rsync, http) cannot be used. This command provides support for
23
git-fetch and git-pull to operate by packaging objects and references
24
in an archive at the originating machine, then importing those into
25
another repository using gitlink:git-fetch[1] and gitlink:git-pull[1]
@@ -58,7 +58,7 @@ unbundle <file>::
58
gitlink:git-fetch[1].
59
60
[git-rev-list-args...]::
61
- A list of arguments, accepatble to git-rev-parse and
61
+ A list of arguments, acceptable to git-rev-parse and
62
git-rev-list, that specify the specific objects and references
63
to transport. For example, "master~10..master" causes the
64
current master reference to be packaged along with all objects
@@ -70,7 +70,7 @@ unbundle <file>::
70
[refname...]::
71
A list of references used to limit the references reported as
72
available. This is principally of use to git-fetch, which
73
- expects to recieve only those references asked for and not
73
+ expects to receive only those references asked for and not
74
necessarily everything in the pack (in this case, git-bundle is
75
acting like gitlink:git-fetch-pack[1]).
76
@@ -87,7 +87,7 @@ specified explicitly (e.g., ^master~10), or implicitly (e.g.,
87
master~10..master, master --since=10.days.ago).
88
89
It is very important that the basis used be held by the destination.
90
-It is ok to err on the side of conservatism, causing the bundle file
90
+It is okay to err on the side of conservatism, causing the bundle file
91
to contain objects already in the destination as these are ignored
92
when unpacking at the destination.
93
Documentation/git-svn.txt
+1
-1
@@ -405,7 +405,7 @@ Tracking and contributing to an entire Subversion-managed project
405
# with the appropriate name):
406
git reset --hard remotes/trunk
407
# You may only dcommit to one branch/tag/trunk at a time. The usage
408
-# of dcommit/rebase/show-ignore should be teh same as above.
408
+# of dcommit/rebase/show-ignore should be the same as above.
409
------------------------------------------------------------------------
410
411
REBASE VS. PULL/MERGE