summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--builtin-apply.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 11641a92e3..2e2acd72c7 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -70,8 +70,8 @@ OPTIONS
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.
+ parts of the patch that are applicable, and leave the
+ rejected hunks in corresponding *.rej files.
-z::
When showing the index information, do not munge paths,
diff --git a/builtin-apply.c b/builtin-apply.c
index a874375e78..0b00a98aa1 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2557,7 +2557,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
continue;
}
if (!strcmp(arg, "--reject")) {
- apply = apply_with_reject = 1;
+ apply = apply_with_reject = apply_verbosely = 1;
continue;
}
if (!strcmp(arg, "--verbose")) {