diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-07-01 02:33:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-07-01 02:33:06 +0000 |
| commit | 73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c (patch) | |
| tree | d44e468e3f0b00e132975f80c4aff9d30914d104 /gittutorial.txt | |
| parent | 688eae05f06ef3b7369c5631140c670296654de1 (diff) | |
| download | git-htmldocs-73d812ca2a8cff55e5ebb8a11b6f7d0496bba62c.tar.gz | |
Autogenerated HTML docs for v1.6.3.3-363-g725cf
Diffstat (limited to 'gittutorial.txt')
| -rw-r--r-- | gittutorial.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gittutorial.txt b/gittutorial.txt index c7fa949c2..cf0689cfe 100644 --- a/gittutorial.txt +++ b/gittutorial.txt @@ -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 |