author | Junio C Hamano <junkio@cox.net> | |
Sun, 27 Aug 2006 22:53:20 +0000 (15:53 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 27 Aug 2006 22:53:20 +0000 (15:53 -0700) | ||
commit | 8938045a4eae7a9c39631508a3c3d34c50c6257a | |
tree | b3ab1ea110fadbbcdffbae0cd9f32cc08d61cd61 | tree | snapshot |
parent | 0e9ee32358413feaa4e1cb664cb0a1e6d52f434f | commit | diff |
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>
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>
Documentation/git-apply.txt | diff | blob | history | |
builtin-apply.c | diff | blob | history |