From 3917eeaf8d21b8b90a773c46ee5b9d12eac901e3 Mon Sep 17 00:00:00 2001 From: kalledaballe Date: Sat, 10 Feb 2018 16:08:45 +0100 Subject: [PATCH 3/5] I changed the sequence of 2 sentences. --- Documentation/user-manual.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index e3efc26..b9dc17a 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -609,13 +609,9 @@ $ git show HEAD^2 # show the second parent of HEAD In addition to HEAD, there are several other special names for commits: -Merges (to be discussed later), as well as operations such as -`git reset`, which change the currently checked-out commit, generally -set ORIG_HEAD to the value HEAD had before the current operation. +ORIG_HEAD is set to the value HEAD before merging (to be discussed later) operations as well as operations such as `git reset'. which change the currently checked-out commit. -The `git fetch` operation always stores the head of the last fetched -branch in FETCH_HEAD. For example, if you run `git fetch` without -specifying a local branch as the target of the operation +FETCH_HEAD after a `git fetch' operation stores the head of the last fetched branch. For example, if you run `git fetch' without specifying a local branch as the target of the operation. ------------------------------------------------- $ git fetch git://example.com/proj.git theirbranch @@ -664,7 +660,7 @@ can also make more specific requests: ------------------------------------------------- $ git log v2.5.. # commits since (not reachable from) v2.5 -$ git log test..master # commits reachable from master but not test +$ git log ..master # commits reachable from master but not from test $ git log master..test # ...reachable from test but not master $ git log master...test # ...reachable from either test or master, # but not both -- 2.1.4