4 commits

Author	SHA1	Message	Date
Linus Torvalds	5fca669f19	Make "git fetch" able to fetch a named tag ... Use "git fetch <repo> tag <tagname>" to get the named tag and everything it points to.	2005-06-23 08:59:00 -07:00
Linus Torvalds	6b38a402e9	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.	2005-06-21 14:04:13 -07:00
Linus Torvalds	ed37b5b2b9	Make fetch/pull scripts terminate cleanly on errors ... Don't continue with a merge if the fetch failed.	2005-06-06 17:40:22 -07:00
Linus Torvalds	7ef76925d9	Split up git-pull-script into separate "fetch" and "merge" phases. ... This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.	2005-05-22 11:03:24 -07:00