![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 5 May 2005 18:43:30 +0000 (11:43 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 5 May 2005 18:43:30 +0000 (11:43 -0700) | ||
| commit | 67cc5c4ef8b84961946e58bfb896c11b7fd33cc7 | |
| tree | 7e96058970fe1fae3704bfb301bcd97fab41ad0c | tree | snapshot |
| parent | 160c8433d904340615bafd7757355618e99e20d5 | commit | diff |
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.
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.
| Makefile | diff | blob | history | |
| git-pull-script | diff | blob | history | |
| git-resolve-script | [new file with mode: 0644] | blob |