Browse Source

Documentation: typos / spelling fixes

Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Mike Ralphson 16 years ago committed by Junio C Hamano
parent
commit
1168d402d2
  1. 2
      Documentation/RelNotes-1.6.0.txt
  2. 2
      Documentation/config.txt
  3. 2
      Documentation/git-cat-file.txt
  4. 2
      Documentation/git-for-each-ref.txt
  5. 2
      Documentation/git-mergetool.txt
  6. 4
      Documentation/git-svn.txt
  7. 4
      Documentation/merge-config.txt

2
Documentation/RelNotes-1.6.0.txt

@ -187,7 +187,7 @@ Updates since v1.5.6 @@ -187,7 +187,7 @@ Updates since v1.5.6
command internally uses rev-parse to interpret its arguments.

* git-rev-list learned --children option to show child commits it
encountered during the traversal, instead of shoing parent commits.
encountered during the traversal, instead of showing parent commits.

* git-send-mail can talk not just over SSL but over TLS now.


2
Documentation/config.txt

@ -693,7 +693,7 @@ gitcvs.usecrlfattr @@ -693,7 +693,7 @@ gitcvs.usecrlfattr
files to determine the '-k' modes to use. If `crlf` is set,
the '-k' mode will be left blank, so cvs clients will
treat it as text. If `crlf` is explicitly unset, the file
will be set with '-kb' mode, which supresses any newline munging
will be set with '-kb' mode, which suppresses any newline munging
the client might otherwise do. If `crlf` is not specified,
then 'gitcvs.allbinary' is used. See linkgit:gitattributes[5].


2
Documentation/git-cat-file.txt

@ -81,7 +81,7 @@ object specified on stdin: @@ -81,7 +81,7 @@ object specified on stdin:
------------

If '--batch-check' is specified, output of the following form is printed for
each object specified fon stdin:
each object specified on stdin:

------------
<sha1> SP <type> SP <size> LF

2
Documentation/git-for-each-ref.txt

@ -49,7 +49,7 @@ OPTIONS @@ -49,7 +49,7 @@ OPTIONS

<pattern>...::
If one or more patterns are given, only refs are shown that
match againt at least one pattern, either using fnmatch(3) or
match against at least one pattern, either using fnmatch(3) or
literally, in the latter case matching completely or from the
beginning up to a slash.


2
Documentation/git-mergetool.txt

@ -40,7 +40,7 @@ tool is available in PATH. @@ -40,7 +40,7 @@ tool is available in PATH.
+
Instead of running one of the known merge tool programs
'git-mergetool' can be customized to run an alternative program
by specifying the command line to invoke in a configration
by specifying the command line to invoke in a configuration
variable `mergetool.<tool>.cmd`.
+
When 'git-mergetool' is invoked with this tool (either through the

4
Documentation/git-svn.txt

@ -13,7 +13,7 @@ DESCRIPTION @@ -13,7 +13,7 @@ DESCRIPTION
-----------
'git-svn' is a simple conduit for changesets between Subversion and git.
It provides a bidirectional flow of changes between a Subversion and a git
respository.
repository.

'git-svn' can track a single Subversion branch simply by using a
URL to the branch, follow branches laid out in the Subversion recommended
@ -209,7 +209,7 @@ Any other arguments are passed directly to 'git-log' @@ -209,7 +209,7 @@ Any other arguments are passed directly to 'git-log'
Recursively finds the svn:ignore property on directories and
creates matching .gitignore files. The resulting files are staged to
be committed, but are not committed. Use -r/--revision to refer to a
specfic revision.
specific revision.

'show-ignore'::
Recursively finds and lists the svn:ignore property on

4
Documentation/merge-config.txt

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
merge.stat::
Whether to print the diffstat berween ORIG_HEAD and merge result
Whether to print the diffstat between ORIG_HEAD and merge result
at the end of the merge. True by default.

merge.log::
@ -16,7 +16,7 @@ merge.tool:: @@ -16,7 +16,7 @@ merge.tool::
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
"opendiff". Any other value is treated is custom merge tool
and there must be a corresponing mergetool.<tool>.cmd option.
and there must be a corresponding mergetool.<tool>.cmd option.

merge.verbosity::
Controls the amount of output shown by the recursive merge

Loading…
Cancel
Save