diff options
| author | Michael Coleman <tutufan@gmail.com> | 2007-02-28 23:14:23 -0600 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-01 03:27:36 -0800 |
| commit | 20f50f1670c18173d74a34527b0c538c3fbbfde3 (patch) | |
| tree | 4c896f39508f10706e38c52eda463e575416b19f | |
| parent | 2eb06531e3d53c2604f20c32e5cb791d5044ff02 (diff) | |
| download | git-20f50f1670c18173d74a34527b0c538c3fbbfde3.tar.gz | |
fix various doc typos
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/RelNotes-1.5.1.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-bundle.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-svn.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/RelNotes-1.5.1.txt b/Documentation/RelNotes-1.5.1.txt index 5ce385b442..aa371be1da 100644 --- a/Documentation/RelNotes-1.5.1.txt +++ b/Documentation/RelNotes-1.5.1.txt @@ -50,7 +50,7 @@ Updates since v1.5.0 LF at the end of lines. Currently, which paths to consider 'text' (i.e. be subjected to the autocrlf mechanism) is decided purely based on the contents, but the plan is to - allow users to explicitly override this heuristics based on + allow users to explicitly override this heuristic based on paths. - The behaviour of 'git-apply', when run in a subdirectory, diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index 4ea9e85d5e..92e7a68722 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -19,7 +19,7 @@ DESCRIPTION Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected so the interactive git protocols (git, ssh, -rsync, http) cannot be used. This command provides suport for +rsync, http) cannot be used. This command provides support for git-fetch and git-pull to operate by packaging objects and references in an archive at the originating machine, then importing those into another repository using gitlink:git-fetch[1] and gitlink:git-pull[1] @@ -58,7 +58,7 @@ unbundle <file>:: gitlink:git-fetch[1]. [git-rev-list-args...]:: - A list of arguments, accepatble to git-rev-parse and + A list of arguments, acceptable to git-rev-parse and git-rev-list, that specify the specific objects and references to transport. For example, "master~10..master" causes the current master reference to be packaged along with all objects @@ -70,7 +70,7 @@ unbundle <file>:: [refname...]:: A list of references used to limit the references reported as available. This is principally of use to git-fetch, which - expects to recieve only those references asked for and not + expects to receive only those references asked for and not necessarily everything in the pack (in this case, git-bundle is acting like gitlink:git-fetch-pack[1]). @@ -87,7 +87,7 @@ specified explicitly (e.g., ^master~10), or implicitly (e.g., master~10..master, master --since=10.days.ago). It is very important that the basis used be held by the destination. -It is ok to err on the side of conservatism, causing the bundle file +It is okay to err on the side of conservatism, causing the bundle file to contain objects already in the destination as these are ignored when unpacking at the destination. diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index cf094ca357..87161aedd1 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -405,7 +405,7 @@ Tracking and contributing to an entire Subversion-managed project # with the appropriate name): git reset --hard remotes/trunk # You may only dcommit to one branch/tag/trunk at a time. The usage -# of dcommit/rebase/show-ignore should be teh same as above. +# of dcommit/rebase/show-ignore should be the same as above. ------------------------------------------------------------------------ REBASE VS. PULL/MERGE |