summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Thomas Ackermann <th.acker@arcor.de>2013-08-27 19:56:04 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-27 15:14:42 -0700
commit95f9be556dad9e4a92bbfed30d5ef01a5fd9df3a (patch)
tree37b643df23f1d08668c6ca12859e8958f6f57d74
parentCall it "Git User Manual" and remove reference to very old Git version (diff)
downloadtgif-95f9be556dad9e4a92bbfed30d5ef01a5fd9df3a.tar.xz
Use current "detached HEAD" message
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/user-manual.txt19
1 files changed, 13 insertions, 6 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 103ec9ad04..bdefd9a77a 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -312,10 +312,17 @@ referenced by a tag:
------------------------------------------------
$ git checkout v2.6.17
-Note: moving to "v2.6.17" which isn't a local branch
-If you want to create a new branch from this checkout, you may do so
-(now or later) by using -b with the checkout command again. Example:
- git checkout -b <new_branch_name>
+Note: checking out 'v2.6.17'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+ git checkout -b new_branch_name
+
HEAD is now at 427abfa... Linux v2.6.17
------------------------------------------------
@@ -326,7 +333,7 @@ and git branch shows that you are no longer on a branch:
$ cat .git/HEAD
427abfa28afedffadfca9dd8b067eb6d36bac53f
$ git branch
-* (no branch)
+* (detached from v2.6.17)
master
------------------------------------------------
@@ -3639,7 +3646,7 @@ working on a branch.
-------------------------------------------------
$ git branch
-* (no branch)
+* (detached from d266b98)
master
-------------------------------------------------