diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:57 -0700 |
commit | be9d07f520ef10359202492652ee7a6001f7100b (patch) | |
tree | d51b896109cf6e980a4be6ae382124ad4e9d3f37 /Documentation | |
parent | 4fe3ed130201a95212dd18cb3bef104d44ed49c4 (diff) | |
parent | 1d77d249f9b0605ed21ca751c5dfb8550efcdfa3 (diff) | |
download | git-be9d07f520ef10359202492652ee7a6001f7100b.tar.gz git-be9d07f520ef10359202492652ee7a6001f7100b.tar.xz |
Merge branch 'jc/detached-head-doc' into maint
* jc/detached-head-doc:
glossary: extend "detached HEAD" description
Conflicts:
Documentation/glossary-content.txt
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/glossary-content.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index eb7ba84f1..2478a3963 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -100,9 +100,22 @@ to point at the new commit. [[def_detached_HEAD]]detached HEAD:: Normally the <<def_HEAD,HEAD>> stores the name of a - <<def_branch,branch>>. However, Git also allows you to <<def_checkout,check out>> - an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any - particular branch. In this case HEAD is said to be "detached". + <<def_branch,branch>>, and commands that operate on the + history HEAD represents operate on the history leading to the + tip of the branch the HEAD points at. However, Git also + allows you to <<def_checkout,check out>> an arbitrary + <<def_commit,commit>> that isn't necessarily the tip of any + particular branch. The HEAD in such a state is called + "detached". ++ +Note that commands that operate on the history of the current branch +(e.g. `git commit` to build a new history on top of it) still work +while the HEAD is detached. They update the HEAD to point at the tip +of the updated history without affecting any branch. Commands that +update or inquire information _about_ the current branch (e.g. `git +branch --set-upstream-to` that sets what remote tracking branch the +current branch integrates with) obviously do not work, as there is no +(real) current branch to ask about in this state. [[def_dircache]]dircache:: You are *waaaaay* behind. See <<def_index,index>>. |