summaryrefslogtreecommitdiff
path: root/git-fetch-script
AgeCommit message (Collapse)AuthorFilesLines
2005-06-23Make "git fetch" able to fetch a named tagLibravatar Linus Torvalds1-2/+8
Use "git fetch <repo> tag <tagname>" to get the named tag and everything it points to.
2005-06-21Clean up different special *HEAD handlingLibravatar Linus Torvalds1-2/+2
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-06Make fetch/pull scripts terminate cleanly on errorsLibravatar Linus Torvalds1-2/+2
Don't continue with a merge if the fetch failed.
2005-05-22Split up git-pull-script into separate "fetch" and "merge" phases.Libravatar Linus Torvalds1-0/+41
This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.