summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-02-13 23:48:20 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-02-13 23:48:20 +0000
commit9d52e57498c466188232dce375f9f24e983e616e (patch)
tree58e45b4f6cc59112f7f4d5cfcb43b6da658babcf /git-checkout.txt
parent78ded48142f45424cec5fbe3cf18802ad96f2202 (diff)
downloadgit-htmldocs-9d52e57498c466188232dce375f9f24e983e616e.tar.gz
Autogenerated HTML docs for v1.5.0-rc4-372-g26cfc
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt22
1 files changed, 6 insertions, 16 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index 55c928943..e4ffde4fd 100644
--- a/git-checkout.txt
+++ b/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