2 Commits

Author	SHA1	Message	Date
Linus Torvalds	d5a72fd622	Fix git-resolve-script. ... I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.	2005-05-05 16:07:56 -07:00
Linus Torvalds	67cc5c4ef8	Split "git-pull-script" into two parts ... Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days.	2005-05-05 11:43:30 -07:00