ORIG_HEAD, FETCH_HEAD, MERGE_HEAD etc

Git

Git Problem Overview


There's a lot of useful git references (what is the exact name for this?), e.g. HEAD, ORIG_HEAD, FETCH_HEAD, MERGE_HEAD, @{upstream} etc.

Is there any reference for this? A complete list with explanations?

Git Solutions


Solution 1 - Git

git help revisions brings up http://git-scm.com/docs/gitrevisions, which describes all the the most common ways to reference commits:

  • HEAD names the commit on which you based the changes in the working tree.
  • FETCH_HEAD records the branch which you fetched from a remote repository with your last git fetch invocation.
  • ORIG_HEAD is created by commands that move your HEAD in a drastic way, to record the position of the HEAD before their operation, so that you can easily change the tip of the branch back to the state before you ran them.
  • MERGE_HEAD records the commit(s) which you are merging into your branch when you run git merge.
  • CHERRY_PICK_HEAD records the commit which you are cherry-picking when you run git cherry-pick.

From the git source, you can also find out about BISECT_HEAD, REVERT_HEAD, REJECT_NON_FF_HEAD and several others that you will almost certainly never need.

That reference also explains suffixes (^N, ~N, @{...}), ranges (.. vs ...), and more.

Solution 2 - Git

HEAD: The current ref that you’re looking at. In most cases it’s probably refs/heads/master

FETCH_HEAD: The SHAs of branch/remote heads that were updated during the last git fetch

ORIG_HEAD: When doing a merge, this is the SHA of the branch you’re merging into.

MERGE_HEAD: When doing a merge, this is the SHA of the branch you’re merging from.

CHERRY_PICK_HEAD: When doing a cherry-pick, this is the SHA of the commit which you are cherry-picking.

The complete list of these refs can be found by cloning git sources:

git clone https://github.com/git/git.git

and grepping the _HEAD" string in .c files. They are dispersed all over the place, but still can be easily found.

P.S.

git help revisions does not show the list of all possible named refs.

Solution 3 - Git

This is what the official Linux Kernel Git documentation for Git revisions says:

> HEAD names the commit on which you based the changes in the working tree. > > FETCH_HEAD records the branch which you fetched from a remote repository with your last git fetch invocation. > > ORIG_HEAD is created by commands that move your HEAD in a drastic way, to record the position of the HEAD before their operation, so that you can easily change the tip of the branch back to the state before you ran them. > > MERGE_HEAD records the commit(s) which you are merging into your branch when you run git merge. > > CHERRY_PICK_HEAD records the commit which you are cherry-picking when you run git cherry-pick.

Also, for @{upstream}:

> <refname>@{upstream}, e.g. master@{upstream}, @{u} > > The suffix @{upstream} to a ref (short form <refname>@{u}) refers to the branch the ref is set to build on top of. A missing ref defaults to the current branch.

Solution 4 - Git

These references are called pointers. They are just regular pointers in programmer terms to tree-ish entities that exist within Git. Note that a tree-ish is anything that consists of at least one commit, i.e. a branch, tag, stash or something like HEAD. Regarding a complete list, I think the only one that exists is the manual:

http://git-scm.com/documentation

While there is no complete list of the available special pointers like HEAD The manual does cover the complete list of available pointers therein, although they are kind of hard to find.

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
QuestiontakeshinView Question on Stackoverflow
Solution 1 - GitdahlbykView Answer on Stackoverflow
Solution 2 - GitSergey K.View Answer on Stackoverflow
Solution 3 - Gituser456814View Answer on Stackoverflow
Solution 4 - GitusumoioView Answer on Stackoverflow