diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 21:04:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 21:04:13 (GMT) |
| commit | 6b38a402e97274037982a5346ca4168cc8ee026c (patch) | |
| tree | df65bb53e13bac7ef13375fa5f067d14f96e4532 /diff-delta.c | |
| parent | d565b3412a0242e2c729bd77d18c74ecd57184dc (diff) | |
| download | git-6b38a402e97274037982a5346ca4168cc8ee026c.zip git-6b38a402e97274037982a5346ca4168cc8ee026c.tar.gz git-6b38a402e97274037982a5346ca4168cc8ee026c.tar.bz2 | |
Clean up different special *HEAD handling
We codify the following different heads (in addition to the main "HEAD",
which points to the current branch, of course):
- FETCH_HEAD
Populated by "git fetch"
- ORIG_HEAD
The old HEAD before a "git pull/resolve" (successful or not)
- LAST_MERGE
The HEAD we're currently merging in "git pull/resolve"
- MERGE_HEAD
The previous head of a unresolved "git pull", which gets committed by
a "git commit" after manually resolving the result
We used to have "MERGE_HEAD" be populated directly by the fetch, and we
removed ORIG_HEAD and LAST_MERGE too aggressively.
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions