diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 11:03:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 11:03:24 -0700 |
| commit | 7ef76925d9c19ef74874e1735e2436e56d0c4897 (patch) | |
| tree | 0f31a7ea7b6e6b37e7e25d1fdb843172ef246b84 /Makefile | |
| parent | 6b14d7faf0bad026a81a27bac07b47691f621b8f (diff) | |
| download | git-7ef76925d9c19ef74874e1735e2436e56d0c4897.tar.gz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ INSTALL=install SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \ git-pull-script git-tag-script git-resolve-script git-whatchanged \ - git-deltafy-script + git-deltafy-script git-fetch-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 \ |