summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-27 00:27:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-29 19:52:03 (GMT)
commite47e35acdda5e334befcde6ffaf207cb5a63b6f4 (patch)
tree6088772d6e7913f68df719f8e2b2050fb9bbca5d /Documentation
parent48313592bf318139b39d6017a863f27420e3939a (diff)
downloadgit-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.zip
git-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.tar.gz
git-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.tar.bz2
Remove git-apply-patch-script.
Now the rebase is rewritten to use git cherry-pick, there is no user for that ancient script. I've checked Cogito and StGIT to make sure they do not use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-apply-patch-script.txt32
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt2
3 files changed, 1 insertions, 36 deletions
diff --git a/Documentation/git-apply-patch-script.txt b/Documentation/git-apply-patch-script.txt
deleted file mode 100644
index 808d3cd..0000000
--- a/Documentation/git-apply-patch-script.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-git-apply-patch-script(1)
-=========================
-v0.99.4, May 2005
-
-NAME
-----
-git-apply-patch-script - Sample script to apply the diffs from git-diff-*
-
-
-SYNOPSIS
---------
-'git-apply-patch-script'
-
-DESCRIPTION
------------
-This is a sample script to be used via the 'GIT_EXTERNAL_DIFF'
-environment variable to apply the differences that the "git-diff-*"
-family of commands report to the current work tree.
-
-
-Author
-------
-Written by 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
-
diff --git a/Documentation/git.txt b/Documentation/git.txt
index f63cbdd..807a470 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -260,9 +260,6 @@ Manipulators:
link:git-relink-script.html[git-relink-script]::
Hardlink common objects in local repositories.
-link:git-apply-patch-script.html[git-apply-patch-script]::
- Sample script to apply the diffs from git-diff-*
-
link:git-convert-cache.html[git-convert-cache]::
Converts old-style GIT repository
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index f627e42..4523b69 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -38,7 +38,7 @@ ancestry graph looked like this:
So I started from master, made a bunch of edits, and committed:
$ git checkout master
- $ cd Documentation; ed git.txt git-apply-patch-script.txt ...
+ $ cd Documentation; ed git.txt ...
$ cd ..; git add Documentation/*.txt
$ git commit -s -v