diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-27 22:53:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-27 22:53:20 (GMT) |
| commit | 8938045a4eae7a9c39631508a3c3d34c50c6257a (patch) | |
| tree | b3ab1ea110fadbbcdffbae0cd9f32cc08d61cd61 /Documentation | |
| parent | 0e9ee32358413feaa4e1cb664cb0a1e6d52f434f (diff) | |
| download | git-8938045a4eae7a9c39631508a3c3d34c50c6257a.zip git-8938045a4eae7a9c39631508a3c3d34c50c6257a.tar.gz git-8938045a4eae7a9c39631508a3c3d34c50c6257a.tar.bz2 | |
git-apply --reject: finishing touches.
After a failed "git am" attempt:
git apply --reject --verbose .dotest/patch
applies hunks that are applicable and leaves *.rej files the
rejected hunks, and it reports what it is doing. With --index,
files with a rejected hunk do not get their index entries
updated at all, so "git diff" will show the hunks that
successfully got applied.
Without --verbose to remind the user that the patch updated some
other paths cleanly, it is very easy to lose track of the status
of the working tree, so --reject implies --verbose.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 11641a9..2e2acd7 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, |