From: René Scharfe Date: Wed, 17 Jan 2007 15:32:41 +0000 (+0100) Subject: Documentation: a few spelling fixes X-Git-Tag: v1.5.0-rc2~57 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23bfbb815d7d71ff20c014f4610732597f0a75db;p=git.git Documentation: a few spelling fixes Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 95bea6637..a5051aad6 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -83,7 +83,7 @@ git-add git-*.sh:: Interactive mode ---------------- When the command enters the interactive mode, it shows the -output of the 'status' subcommand, and then goes into ints +output of the 'status' subcommand, and then goes into its interactive command loop. The command loop shows the list of subcommands available, and diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index bdfc66692..b14e79407 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -24,7 +24,7 @@ replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe" interface briefly mentioned in the following paragraph. Apart from supporting file annotation, git also supports searching the -development history for when a code snippet occured in a change. This makes it +development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for a text string in the diff. A small example: @@ -89,7 +89,7 @@ THE PORCELAIN FORMAT -------------------- In this format, each line is output after a header; the -header at the minumum has the first line which has: +header at the minimum has the first line which has: - 40-byte SHA-1 of the commit the line is attributed to; - the line number of the line in the original file; @@ -112,8 +112,8 @@ header, prefixed by a TAB. This is to allow adding more header elements later. -SPECIFIYING RANGES ------------------- +SPECIFYING RANGES +----------------- Unlike `git-blame` and `git-annotate` in older git, the extent of annotation can be limited to both line ranges and revision diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index e872fc89f..d5f811826 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -74,7 +74,7 @@ OPTIONS List both remote-tracking branches and local branches. -v:: - Show sha1 and commit subjectline for each head. + Show sha1 and commit subject line for each head. --abbrev=:: Alter minimum display length for sha1 in output listing, diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 9c8435306..bd1c22b31 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -111,7 +111,7 @@ but can be used to amend a merge commit. are concluding a conflicted merge. -q|--quiet:: - Supress commit summary message. + Suppress commit summary message. \--:: Do not interpret any more arguments as options. diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 5c402de26..44713949a 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -97,7 +97,7 @@ If you need to pass multiple options, separate them with a comma. Substitute the character "/" in branch names with -A :: - CVS by default uses the unix username when writing its + CVS by default uses the Unix username when writing its commit logs. Using this option and an author-conv-file in this format diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 2bf6aef73..06e7ab1ec 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -15,7 +15,7 @@ DESCRIPTION Iterate over all refs that match `` and show them according to the given ``, after sorting them according to the given set of ``. If `` is given, stop after -showing that many refs. The interporated values in `` +showing that many refs. The interpolated values in `` can optionally be quoted as string literals in the specified host language allowing their direct evaluation in that language. diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 73d78c15e..2bcc9491a 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.txt @@ -35,7 +35,7 @@ can be set to indicate how long historical reflog entries which are not part of the current branch should remain available in this repository. These types of entries are generally created as a result of using `git commit \--amend` or `git rebase` and are the -commits prior to the amend or rebase occuring. Since these changes +commits prior to the amend or rebase occurring. Since these changes are not part of the current project most users will want to expire them sooner. This option defaults to '30 days'. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index bfbece986..0140c8e35 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -91,7 +91,7 @@ OPTIONS combined by 'or'. --and | --or | --not | ( | ):: - Specify how multiple patterns are combined using boolean + Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns. diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index c8a4c5a4d..c254005ca 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -29,7 +29,7 @@ OPTIONS -u , --upload-pack=:: Specify the full path of gitlink:git-upload-pack[1] on the remote host. This allows listing references from repositories accessed via - SSH and where the SSH deamon does not use the PATH configured by the + SSH and where the SSH daemon does not use the PATH configured by the user. Also see the '--exec' option for gitlink:git-peek-remote[1]. :: diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 08a055713..c65c59e86 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -38,7 +38,7 @@ its working state. This resets the metadata used by rerere if a merge resolution is to be is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1] -[--skip|--abort] will automatcally invoke this command. +[--skip|--abort] will automatically invoke this command. 'diff':: diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 95fa9010c..b0df92e81 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -29,7 +29,7 @@ OPTIONS of author alphabetic order. -s:: - Supress commit description and provide a commit count summary only. + Suppress commit description and provide a commit count summary only. FILES ----- diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 9ed721118..321083d46 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -113,7 +113,7 @@ manually joining branches on commit. 'commit-diff':: Commits the diff of two tree-ish arguments from the - command-line. This command is intended for interopability with + command-line. This command is intended for interoperability with git-svnimport and does not rely on being inside an git-svn init-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the