diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 11:43:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 11:43:30 -0700 |
| commit | 67cc5c4ef8b84961946e58bfb896c11b7fd33cc7 (patch) | |
| tree | 7e96058970fe1fae3704bfb301bcd97fab41ad0c /Makefile | |
| parent | git-diff-cache: add "-m" flag to match all non-checked-out files with the index. (diff) | |
| download | tgif-67cc5c4ef8b84961946e58bfb896c11b7fd33cc7.tar.xz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -13,7 +13,7 @@ CC=gcc AR=ar SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \ - git-pull-script git-tag-script + git-pull-script git-tag-script git-resolve-script PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-read-tree git-commit-tree git-cat-file git-fsck-cache \ |