Split up git-pull-script into separate "fetch" and "merge" phases.

diff --git a/Makefile b/Makefile
index 7a2298918a7cfb137314e3c0ae5b66918cf99dcd..120d3c12cad1de6d2e5b02b1bd279fa9fffe52bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 \