Documentation: typos / spelling fixes
Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mike Ralphson committed
Aug 5, 2008 at 17:12 UTC
1168d402d2962f56cbc921bbc954d8f2179c8ba7
7 files changed
+9
-9
Documentation/RelNotes-1.6.0.txt
+1
-1
@@ -187,7 +187,7 @@ Updates since v1.5.6
187
command internally uses rev-parse to interpret its arguments.
188
189
* git-rev-list learned --children option to show child commits it
190
- encountered during the traversal, instead of shoing parent commits.
190
+ encountered during the traversal, instead of showing parent commits.
191
192
* git-send-mail can talk not just over SSL but over TLS now.
193
Documentation/config.txt
+1
-1
@@ -693,7 +693,7 @@ gitcvs.usecrlfattr
693
files to determine the '-k' modes to use. If `crlf` is set,
694
the '-k' mode will be left blank, so cvs clients will
695
treat it as text. If `crlf` is explicitly unset, the file
696
- will be set with '-kb' mode, which supresses any newline munging
696
+ will be set with '-kb' mode, which suppresses any newline munging
697
the client might otherwise do. If `crlf` is not specified,
698
then 'gitcvs.allbinary' is used. See linkgit:gitattributes[5].
699
Documentation/git-cat-file.txt
+1
-1
@@ -81,7 +81,7 @@ object specified on stdin:
81
------------
82
83
If '--batch-check' is specified, output of the following form is printed for
84
-each object specified fon stdin:
84
+each object specified on stdin:
85
86
------------
87
<sha1> SP <type> SP <size> LF
Documentation/git-for-each-ref.txt
+1
-1
@@ -49,7 +49,7 @@ OPTIONS
49
50
<pattern>...::
51
If one or more patterns are given, only refs are shown that
52
- match againt at least one pattern, either using fnmatch(3) or
52
+ match against at least one pattern, either using fnmatch(3) or
53
literally, in the latter case matching completely or from the
54
beginning up to a slash.
55
Documentation/git-mergetool.txt
+1
-1
@@ -40,7 +40,7 @@ tool is available in PATH.
40
+
41
Instead of running one of the known merge tool programs
42
'git-mergetool' can be customized to run an alternative program
43
-by specifying the command line to invoke in a configration
43
+by specifying the command line to invoke in a configuration
44
variable `mergetool.<tool>.cmd`.
45
+
46
When 'git-mergetool' is invoked with this tool (either through the
Documentation/git-svn.txt
+2
-2
@@ -13,7 +13,7 @@ DESCRIPTION
13
-----------
14
'git-svn' is a simple conduit for changesets between Subversion and git.
15
It provides a bidirectional flow of changes between a Subversion and a git
16
-respository.
16
+repository.
17
18
'git-svn' can track a single Subversion branch simply by using a
19
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
Recursively finds the svn:ignore property on directories and
210
creates matching .gitignore files. The resulting files are staged to
211
be committed, but are not committed. Use -r/--revision to refer to a
212
- specfic revision.
212
+ specific revision.
213
214
'show-ignore'::
215
Recursively finds and lists the svn:ignore property on
Documentation/merge-config.txt
+2
-2
@@ -1,5 +1,5 @@
1
merge.stat::
2
- Whether to print the diffstat berween ORIG_HEAD and merge result
2
+ Whether to print the diffstat between ORIG_HEAD and merge result
3
at the end of the merge. True by default.
4
5
merge.log::
@@ -16,7 +16,7 @@ merge.tool::
16
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
17
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
18
"opendiff". Any other value is treated is custom merge tool
19
- and there must be a corresponing mergetool.<tool>.cmd option.
19
+ and there must be a corresponding mergetool.<tool>.cmd option.
20
21
merge.verbosity::
22
Controls the amount of output shown by the recursive merge