summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bd3a5b5)
raw | patch | inline | side by side (parent: bd3a5b5)
author | Junio C Hamano <junkio@cox.net> | |
Tue, 13 Feb 2007 16:58:01 +0000 (08:58 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 13 Feb 2007 18:12:37 +0000 (10:12 -0800) |
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>
in git-checkout.
Pointed out by Matthias Lederhofer.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-checkout.txt | patch | blob | history |
index 55c9289438e65d62d960ac909f6481b178f1d80e..e4ffde4fdd78f4fe476951c9eeabebf143647eb3 100644 (file)
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