git/Documentation/git-apply.txt
Junio C Hamano 12dd6e8cb0 [PATCH] apply: match documentation, usage string and code.
The more recent --apply option was not described.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-13 20:53:33 -07:00

77 lines
1.9 KiB
Plaintext

git-apply(1)
============
v0.1, June 2005
NAME
----
git-apply - Apply patch on a GIT index file and a work tree
SYNOPSIS
--------
'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
DESCRIPTION
-----------
Reads supplied diff output and applies it on a GIT index file
and a work tree.
OPTIONS
-------
<patch>...::
The files to read patch from. '-' can be used to read
from the standard input.
--no-merge::
The default mode of operation is the merge behaviour
which is not implemented yet. This flag explicitly
tells the program not to use the merge behaviour.
--stat::
Instead of applying the patch, output diffstat for the
input. Turns off "apply".
--summary::
Instead of applying the patch, output a condensed
summary of information obtained from git diff extended
headers, such as creations, renames and mode changes.
Turns off "apply".
--check::
Instead of applying the patch, see if the patch is
applicable to the current work tree and/or the index
file and detects errors. Turns off "apply".
--index::
When --check is in effect, or when applying the patch
(which is the default when none of the options that
disables it is in effect), make sure the patch is
applicable to what the current index file records. If
the file to be patched in the work tree is not
up-to-date, it is flagged as an error. This flag also
causes the index file to be updated.
--show-files::
Show summary of files that are affected by the patch.
--apply::
If you use any of the options marked ``Turns off
"apply"'' above, git-apply reads and outputs the
information you asked without actually applying the
patch. Give this flag after those flags to also apply
the patch.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano
GIT
---
Part of the link:git.html[git] suite