doc: A few minor copy edits.
- (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Štěpán Němec committed
Jul 15, 2012 at 00:20 UTC
7615cb005bf15abce05cbdde775e5fdf4662d655
5 files changed
+10
-10
Documentation/git-merge.txt
+1
-1
@@ -181,7 +181,7 @@ final result verbatim. When both sides made changes to the same area,
181
however, git cannot randomly pick one side over the other, and asks you to
182
resolve it by leaving what both sides did to that area.
183
184
-By default, git uses the same style as that is used by "merge" program
184
+By default, git uses the same style as the one used by the "merge" program
185
from the RCS suite to present such a conflicted hunk, like this:
186
187
------------
Documentation/git-rebase.txt
+1
-1
@@ -273,7 +273,7 @@ which makes little sense.
273
Pass the <strategy-option> through to the merge strategy.
274
This implies `--merge` and, if no strategy has been
275
specified, `-s recursive`. Note the reversal of 'ours' and
276
- 'theirs' as noted in above for the `-m` option.
276
+ 'theirs' as noted above for the `-m` option.
277
278
-q::
279
--quiet::
Documentation/glossary-content.txt
+1
-1
@@ -117,7 +117,7 @@ to point at the new commit.
117
118
[[def_ent]]ent::
119
Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See
120
- `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
120
+ http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
121
explanation. Avoid this term, not to confuse people.
122
123
[[def_evil_merge]]evil merge::
Documentation/rev-list-options.txt
+1
-1
@@ -760,7 +760,7 @@ options may be given. See linkgit:git-diff-files[1] for more options.
760
761
--cc::
762
763
- This flag implies the '-c' options and further compresses the
763
+ This flag implies the '-c' option and further compresses the
764
patch output by omitting uninteresting hunks whose contents in
765
the parents have only two variants and the merge result picks
766
one of them without modification.
Documentation/user-manual.txt
+6
-6
@@ -2870,7 +2870,7 @@ $ git fetch example
2870
You can also add a "+" to force the update each time:
2871
2872
-------------------------------------------------
2873
-$ git config remote.example.fetch +master:ref/remotes/example/master
2873
+$ git config remote.example.fetch +master:refs/remotes/example/master
2874
-------------------------------------------------
2875
2876
Don't do this unless you're sure you won't mind "git fetch" possibly
@@ -2966,7 +2966,7 @@ As you can see, a commit is defined by:
2966
2967
- a tree: The SHA-1 name of a tree object (as defined below), representing
2968
the contents of a directory at a certain point in time.
2969
-- parent(s): The SHA-1 name of some number of commits which represent the
2969
+- parent(s): The SHA-1 name(s) of some number of commits which represent the
2970
immediately previous step(s) in the history of the project. The
2971
example above has one parent; merge commits may have more than
2972
one. A commit with no parents is called a "root" commit, and
@@ -3363,8 +3363,8 @@ Date:
3363
:100644 100644 oldsha... 4b9458b... M somedirectory/myfile
3364
------------------------------------------------
3365
3366
-This tells you that the immediately preceding version of the file was
3367
-"newsha", and that the immediately following version was "oldsha".
3366
+This tells you that the immediately following version of the file was
3367
+"newsha", and that the immediately preceding version was "oldsha".
3368
You also know the commit messages that went with the change from oldsha
3369
to 4b9458b and with the change from 4b9458b to newsha.
3370
@@ -4035,8 +4035,8 @@ $ git ls-files --unmerged
4035
Each line of the `git ls-files --unmerged` output begins with
4036
the blob mode bits, blob SHA-1, 'stage number', and the
4037
filename. The 'stage number' is git's way to say which tree it
4038
-came from: stage 1 corresponds to `$orig` tree, stage 2 `HEAD`
4039
-tree, and stage3 `$target` tree.
4038
+came from: stage 1 corresponds to the `$orig` tree, stage 2 to
4039
+the `HEAD` tree, and stage 3 to the `$target` tree.
4040
4041
Earlier we said that trivial merges are done inside
4042
`git read-tree -m`. For example, if the file did not change