summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-13 16:58:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-13 18:12:37 (GMT)
commitcec8d146fc020c3815d424ff6d94b3d3a1aaf1ff (patch)
tree941a98eb6fc118442c2449d9e740d474976e1772 /Documentation/git-checkout.txt
parentbd3a5b5ee5cc627dc278d2028fb017161705fe02 (diff)
downloadgit-cec8d146fc020c3815d424ff6d94b3d3a1aaf1ff.zip
git-cec8d146fc020c3815d424ff6d94b3d3a1aaf1ff.tar.gz
git-cec8d146fc020c3815d424ff6d94b3d3a1aaf1ff.tar.bz2
Documentation: Moving out of detached HEAD does not warn anymore.
The documentation still talked about the unnecessary 'safety' in git-checkout. Pointed out by Matthias Lederhofer. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt22
1 files changed, 6 insertions, 16 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 55c9289..e4ffde4 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -103,22 +103,12 @@ by any branch (which is natural --- you are not on any branch).
What this means is that you can discard your temporary commits
and merges by switching back to an existing branch (e.g. `git
checkout master`), and a later `git prune` or `git gc` would
-garbage-collect them.
-
-The command would refuse to switch back to make sure that you do
-not discard your temporary state by mistake when your detached
-HEAD is not pointed at by any existing ref. If you did want to
-save your state (e.g. "I was interested in the fifth commit from
-the top of 'master' branch", or "I made two commits to fix minor
-bugs while on a detached HEAD" -- and if you do not want to lose
-these facts), you can create a new branch and switch to it with
-`git checkout -b newbranch` so that you can keep building on
-that state, or tag it first so that you can come back to it
-later and switch to the branch you wanted to switch to with `git
-tag that_state; git checkout master`. On the other hand, if you
-did want to discard the temporary state, you can give `-f`
-option (e.g. `git checkout -f master`) to override this
-behaviour.
+garbage-collect them. If you did this by mistake, you can ask
+the reflog for HEAD where you were, e.g.
+
+------------
+$ git log -g -2 HEAD
+------------
EXAMPLES