summaryrefslogtreecommitdiff
path: root/Documentation/git-pull-script.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-08 00:26:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-08 00:45:20 (GMT)
commit215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7 (patch)
tree6bc7aa4f652d0ef49108d9e30a7ea7fbf8e44639 /Documentation/git-pull-script.txt
parent99977bd5fdeabbd0608a70e9411c243007ec4ea2 (diff)
downloadgit-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.zip
git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.gz
git-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.bz2
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull-script.txt')
-rw-r--r--Documentation/git-pull-script.txt41
1 files changed, 0 insertions, 41 deletions
diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
deleted file mode 100644
index 8111813..0000000
--- a/Documentation/git-pull-script.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-git-pull-script(1)
-==================
-v0.99.4, Aug 2005
-
-NAME
-----
-git-pull-script - Pull and merge from another repository.
-
-
-SYNOPSIS
---------
-'git-pull-script' <repository> <refspec>...
-
-
-DESCRIPTION
------------
-Runs 'git-fetch-script' with the given parameters.
-
-When only one ref is downloaded, runs 'git resolve' to merge it
-into the local HEAD. Otherwise uses 'git octopus' to merge them
-into the local HEAD.
-
-
-OPTIONS
--------
-include::pull-fetch-param.txt[]
-
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <junkio@cox.net>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
-GIT
----
-Part of the link:git.html[git] suite
-