projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use config file settings for http
[git.git]
/
Documentation
/
git-apply.txt
diff --git
a/Documentation/git-apply.txt
b/Documentation/git-apply.txt
index
4f7e119
..
61d9dac
100644
(file)
--- a/
Documentation/git-apply.txt
+++ b/
Documentation/git-apply.txt
@@
-1,19
+1,18
@@
git-apply(1)
============
git-apply(1)
============
-v0.1, June 2005
NAME
----
NAME
----
-git-apply - Apply patch on a
GIT
index file and a work tree
+git-apply - Apply patch on a
git
index file and a work tree
SYNOPSIS
--------
SYNOPSIS
--------
-'git-apply' [--
no-merge] [--
stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
+'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
DESCRIPTION
-----------
DESCRIPTION
-----------
-Reads supplied diff output and applies it on a
GIT
index file
+Reads supplied diff output and applies it on a
git
index file
and a work tree.
OPTIONS
and a work tree.
OPTIONS
@@
-22,11
+21,6
@@
OPTIONS
The files to read patch from. '-' can be used to read
from the standard input.
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".
--stat::
Instead of applying the patch, output diffstat for the
input. Turns off "apply".