Remove git-applypatch
The previous one removed git-applymbox, which was the sole user of this tool. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
@ -239,7 +239,7 @@ One test you could do yourself if your MUA is set up correctly is:
|
||||
$ git fetch http://kernel.org/pub/scm/git/git.git master:test-apply
|
||||
$ git checkout test-apply
|
||||
$ git reset --hard
|
||||
$ git applymbox a.patch
|
||||
$ git am a.patch
|
||||
|
||||
If it does not apply correctly, there can be various reasons.
|
||||
|
||||
@ -247,7 +247,7 @@ If it does not apply correctly, there can be various reasons.
|
||||
does not have much to do with your MUA. Please rebase the
|
||||
patch appropriately.
|
||||
|
||||
* Your MUA corrupted your patch; applymbox would complain that
|
||||
* Your MUA corrupted your patch; "am" would complain that
|
||||
the patch does not apply. Look at .dotest/ subdirectory and
|
||||
see what 'patch' file contains and check for the common
|
||||
corruption patterns mentioned above.
|
||||
|
@ -72,7 +72,6 @@ __DATA__
|
||||
git-add mainporcelain
|
||||
git-am mainporcelain
|
||||
git-annotate ancillaryinterrogators
|
||||
git-applypatch purehelpers
|
||||
git-apply plumbingmanipulators
|
||||
git-archimport foreignscminterface
|
||||
git-archive mainporcelain
|
||||
|
@ -145,7 +145,7 @@ names.
|
||||
|
||||
SEE ALSO
|
||||
--------
|
||||
gitlink:git-applypatch[1], gitlink:git-apply[1].
|
||||
gitlink:git-apply[1].
|
||||
|
||||
|
||||
Author
|
||||
|
@ -1,53 +0,0 @@
|
||||
git-applypatch(1)
|
||||
=================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-applypatch - Apply one patch extracted from an e-mail
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-applypatch' <msg> <patch> <info> [<signoff>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This is usually not what an end user wants to run directly. See
|
||||
gitlink:git-am[1] instead.
|
||||
|
||||
Takes three files <msg>, <patch>, and <info> prepared from an
|
||||
e-mail message by 'git-mailinfo', and creates a commit. It is
|
||||
usually not necessary to use this command directly.
|
||||
|
||||
This command can run `applypatch-msg`, `pre-applypatch`, and
|
||||
`post-applypatch` hooks. See link:hooks.html[hooks] for more
|
||||
information.
|
||||
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
<msg>::
|
||||
Commit log message (sans the first line, which comes
|
||||
from e-mail Subject stored in <info>).
|
||||
|
||||
<patch>::
|
||||
The patch to apply.
|
||||
|
||||
<info>::
|
||||
Author and subject information extracted from e-mail,
|
||||
used on "author" line and as the first line of the
|
||||
commit log message.
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the gitlink:git[7] suite
|
||||
|
@ -16,7 +16,7 @@ DESCRIPTION
|
||||
Reading a single e-mail message from the standard input, and
|
||||
writes the commit log message in <msg> file, and the patches in
|
||||
<patch> file. The author name, e-mail and e-mail subject are
|
||||
written out to the standard output to be used by git-applypatch
|
||||
written out to the standard output to be used by git-am
|
||||
to create a commit. It is usually not necessary to use this
|
||||
command directly. See gitlink:git-am[1] instead.
|
||||
|
||||
|
@ -12,11 +12,10 @@ This document describes the currently defined hooks.
|
||||
applypatch-msg
|
||||
--------------
|
||||
|
||||
This hook is invoked by `git-applypatch` script, which is
|
||||
typically invoked by `git-am`. It takes a single
|
||||
This hook is invoked by `git-am` script. It takes a single
|
||||
parameter, the name of the file that holds the proposed commit
|
||||
log message. Exiting with non-zero status causes
|
||||
`git-applypatch` to abort before applying the patch.
|
||||
`git-am` to abort before applying the patch.
|
||||
|
||||
The hook is allowed to edit the message file in place, and can
|
||||
be used to normalize the message into some project standard
|
||||
@ -29,8 +28,7 @@ The default 'applypatch-msg' hook, when enabled, runs the
|
||||
pre-applypatch
|
||||
--------------
|
||||
|
||||
This hook is invoked by `git-applypatch` script, which is
|
||||
typically invoked by `git-am`. It takes no parameter,
|
||||
This hook is invoked by `git-am`. It takes no parameter,
|
||||
and is invoked after the patch is applied, but before a commit
|
||||
is made. Exiting with non-zero status causes the working tree
|
||||
after application of the patch not committed.
|
||||
@ -44,12 +42,11 @@ The default 'pre-applypatch' hook, when enabled, runs the
|
||||
post-applypatch
|
||||
---------------
|
||||
|
||||
This hook is invoked by `git-applypatch` script, which is
|
||||
typically invoked by `git-am`. It takes no parameter,
|
||||
This hook is invoked by `git-am`. It takes no parameter,
|
||||
and is invoked after the patch is applied and a commit is made.
|
||||
|
||||
This hook is meant primarily for notification, and cannot affect
|
||||
the outcome of `git-applypatch`.
|
||||
the outcome of `git-am`.
|
||||
|
||||
pre-commit
|
||||
----------
|
||||
|
Reference in New Issue
Block a user