diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-16 17:55:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-17 01:23:08 -0700 |
| commit | 57dc397cff09bfabd79ddbc38b704cdd0c2bc6e3 (patch) | |
| tree | cfcfc11f7699b2e3b355c8ffb98648e9dbe072b7 /Documentation/git-apply.txt | |
| parent | 2cda1a214e9d2e362242027b4b622ecb3d9260de (diff) | |
| download | git-57dc397cff09bfabd79ddbc38b704cdd0c2bc6e3.tar.gz git-57dc397cff09bfabd79ddbc38b704cdd0c2bc6e3.tar.xz | |
git-apply --reject
With the new flag "--reject", hunks that do not apply are sent to
the standard output, and the usable hunks are applied. The command
itself exits with non-zero status when this happens, so that the
user or wrapper can take notice and sort the remaining mess out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index f1ab1f9da..11641a92e 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] - [--reverse] [-z] [-pNUM] + [--reverse] [--reject] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] [<patch>...] @@ -66,6 +66,13 @@ OPTIONS --reverse:: Apply the patch in reverse. +--reject:: + For atomicity, `git apply` fails the whole patch and + does not touch the working tree when some of the hunks + do not apply by default. This option makes it apply + parts of the patch that are applicable, and send the + rejected hunks to the standard output of the command. + -z:: When showing the index information, do not munge paths, but use NUL terminated machine readable format. Without |