diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 22:37:38 -0800 |
| commit | f7a2eb735982e921ae4379f1dcf5f7a023610393 (patch) | |
| tree | 26fe2c59a8fed68a531e7b855a495f52198162a2 /Documentation/git-apply.txt | |
| parent | 23ea3e201cea0deea909569e08e950a9ec2345f7 (diff) | |
| parent | 7765e7ebda7e273bca34e87110be899447068b58 (diff) | |
| download | git-f7a2eb735982e921ae4379f1dcf5f7a023610393.tar.gz git-f7a2eb735982e921ae4379f1dcf5f7a023610393.tar.xz | |
This is GIT 1.0-rc1 in disguise. It is plausible that
relatively new parts of the system still need tweaking and
fixing, but that is why it is not 1.0 but rc ;-).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index eb8f90683..6702a18c7 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree SYNOPSIS -------- -'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--index-info] [-z] [<patch>...] +'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [-z] [<patch>...] DESCRIPTION ----------- @@ -72,6 +72,12 @@ OPTIONS patch. Give this flag after those flags to also apply the patch. +--no-add:: + When applying a patch, ignore additions made by the + patch. This can be used to extract common part between + two files by first running `diff` on them and applying + the result with this option, which would apply the + deletion part but not addition part. Author ------ |