提交 21d777f2 编写于 作者: T Thadeu Lima de Souza Cascardo 提交者: Junio C Hamano

Makes some cleanup/review in gittutorial

There are some different but little cleanup changes to fix some missing
quotes, to fix what seemed to be an unended sentence, to reident a
little paragraph with too large a sentence and fix a branch name that
was referred to twice later by another name.
Signed-off-by: NThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 fe104986
......@@ -332,11 +332,11 @@ alice$ git log -p HEAD..FETCH_HEAD
------------------------------------------------
This operation is safe even if Alice has uncommitted local changes.
The range notation HEAD..FETCH_HEAD" means "show everything that is reachable
from the FETCH_HEAD but exclude anything that is reachable from HEAD.
The range notation "HEAD..FETCH_HEAD" means "show everything that is reachable
from the FETCH_HEAD but exclude anything that is reachable from HEAD".
Alice already knows everything that leads to her current state (HEAD),
and reviewing what Bob has in his state (FETCH_HEAD) that she has not
seen with this command
and reviews what Bob has in his state (FETCH_HEAD) that she has not
seen with this command.
If Alice wants to visualize what Bob did since their histories forked
she can issue the following command:
......@@ -375,9 +375,9 @@ it easier:
alice$ git remote add bob /home/bob/myrepo
------------------------------------------------
With this, Alice can perform the first part of the "pull" operation alone using the
'git-fetch' command without merging them with her own branch,
using:
With this, Alice can perform the first part of the "pull" operation
alone using the 'git-fetch' command without merging them with her own
branch, using:
-------------------------------------
alice$ git fetch bob
......@@ -566,22 +566,22 @@ $ git log v2.5.. Makefile # commits since v2.5 which modify
You can also give 'git-log' a "range" of commits where the first is not
necessarily an ancestor of the second; for example, if the tips of
the branches "stable-release" and "master" diverged from a common
the branches "stable" and "master" diverged from a common
commit some time ago, then
-------------------------------------
$ git log stable..experimental
$ git log stable..master
-------------------------------------
will list commits made in the experimental branch but not in the
will list commits made in the master branch but not in the
stable branch, while
-------------------------------------
$ git log experimental..stable
$ git log master..stable
-------------------------------------
will show the list of commits made on the stable branch but not
the experimental branch.
the master branch.
The 'git-log' command has a weakness: it must present commits in a
list. When the history has lines of development that diverged and
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册