mirror of
https://github.com/git/git.git
synced 2026-03-13 10:23:30 +01:00
Merge branch 'jc/apply' into next
* jc/apply: git-apply --reject: finishing touches.
This commit is contained in:
@@ -75,8 +75,8 @@ OPTIONS
|
||||
For atomicity, gitlink:git-apply[1] by default fails the whole patch and
|
||||
does not touch the working tree when some of the hunks
|
||||
do not apply. This option makes it apply
|
||||
the parts of the patch that are applicable, and send the
|
||||
rejected hunks to the standard output of the command.
|
||||
the 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,
|
||||
|
||||
@@ -2555,7 +2555,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")) {
|
||||
|
||||
Reference in New Issue
Block a user