Commit d0587fd5 authored by Junio C Hamano's avatar Junio C Hamano Committed by Linus Torvalds

[PATCH] git-apply: documentation.

Add missing documentation for git-apply.
Signed-off-by: default avatarJunio C Hamano <[email protected]>
Signed-off-by: default avatarLinus Torvalds <[email protected]>
parent 96c912a4
v0.1, June 2005
git-apply - Apply patch on a GIT index file and a work tree
'git-apply' [--no-merge] [--stat] [--summary] [--check]
[--index] [--show-files] [-] [<file>...]
Reads supplied diff output and applies it on a GIT index file
and a work tree.
The files to read patch from.
Instead of reading from a file, read from standard input.
The default mode of operation is the merge behaviour
which is not quite implemented yet. This flag
explicitly tells the program not to use the merge
Instead of applying the patch, output diffstat for the
Instead of applying the patch, output a condensed
summary of information obtained from git diff extended
headers, such as creations, renames and mode changes.
Instead of applying the patch, see if the patch is
applicable to the current work tree and/or the index
file and detects errors.
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 summary of files that are affected by the patch.
Written by Linus Torvalds <[email protected]>
Documentation by Junio C Hamano
Part of the link:git.html[git] suite
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment