mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
7bdb74868c
commit
edfbbf7eea
|
@ -181,7 +181,7 @@ final result verbatim. When both sides made changes to the same area,
|
|||
however, git cannot randomly pick one side over the other, and asks you to
|
||||
resolve it by leaving what both sides did to that area.
|
||||
|
||||
By default, git uses the same style as that is used by "merge" program
|
||||
By default, git uses the same style as the one used by the "merge" program
|
||||
from the RCS suite to present such a conflicted hunk, like this:
|
||||
|
||||
------------
|
||||
|
|
|
@ -273,7 +273,7 @@ which makes little sense.
|
|||
Pass the <strategy-option> through to the merge strategy.
|
||||
This implies `--merge` and, if no strategy has been
|
||||
specified, `-s recursive`. Note the reversal of 'ours' and
|
||||
'theirs' as noted in above for the `-m` option.
|
||||
'theirs' as noted above for the `-m` option.
|
||||
|
||||
-q::
|
||||
--quiet::
|
||||
|
|
|
@ -117,7 +117,7 @@ to point at the new commit.
|
|||
|
||||
[[def_ent]]ent::
|
||||
Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See
|
||||
`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
|
||||
http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
|
||||
explanation. Avoid this term, not to confuse people.
|
||||
|
||||
[[def_evil_merge]]evil merge::
|
||||
|
|
|
@ -760,7 +760,7 @@ options may be given. See linkgit:git-diff-files[1] for more options.
|
|||
|
||||
--cc::
|
||||
|
||||
This flag implies the '-c' options and further compresses the
|
||||
This flag implies the '-c' option and further compresses the
|
||||
patch output by omitting uninteresting hunks whose contents in
|
||||
the parents have only two variants and the merge result picks
|
||||
one of them without modification.
|
||||
|
|
|
@ -2870,7 +2870,7 @@ $ git fetch example
|
|||
You can also add a "+" to force the update each time:
|
||||
|
||||
-------------------------------------------------
|
||||
$ git config remote.example.fetch +master:ref/remotes/example/master
|
||||
$ git config remote.example.fetch +master:refs/remotes/example/master
|
||||
-------------------------------------------------
|
||||
|
||||
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:
|
|||
|
||||
- a tree: The SHA-1 name of a tree object (as defined below), representing
|
||||
the contents of a directory at a certain point in time.
|
||||
- parent(s): The SHA-1 name of some number of commits which represent the
|
||||
- parent(s): The SHA-1 name(s) of some number of commits which represent the
|
||||
immediately previous step(s) in the history of the project. The
|
||||
example above has one parent; merge commits may have more than
|
||||
one. A commit with no parents is called a "root" commit, and
|
||||
|
@ -3363,8 +3363,8 @@ Date:
|
|||
:100644 100644 oldsha... 4b9458b... M somedirectory/myfile
|
||||
------------------------------------------------
|
||||
|
||||
This tells you that the immediately preceding version of the file was
|
||||
"newsha", and that the immediately following version was "oldsha".
|
||||
This tells you that the immediately following version of the file was
|
||||
"newsha", and that the immediately preceding version was "oldsha".
|
||||
You also know the commit messages that went with the change from oldsha
|
||||
to 4b9458b and with the change from 4b9458b to newsha.
|
||||
|
||||
|
@ -4035,8 +4035,8 @@ $ git ls-files --unmerged
|
|||
Each line of the `git ls-files --unmerged` output begins with
|
||||
the blob mode bits, blob SHA-1, 'stage number', and the
|
||||
filename. The 'stage number' is git's way to say which tree it
|
||||
came from: stage 1 corresponds to `$orig` tree, stage 2 `HEAD`
|
||||
tree, and stage3 `$target` tree.
|
||||
came from: stage 1 corresponds to the `$orig` tree, stage 2 to
|
||||
the `HEAD` tree, and stage 3 to the `$target` tree.
|
||||
|
||||
Earlier we said that trivial merges are done inside
|
||||
`git read-tree -m`. For example, if the file did not change
|
||||
|
|
Loading…
Reference in a new issue