summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-27 22:53:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-27 22:53:20 (GMT)
commit8938045a4eae7a9c39631508a3c3d34c50c6257a (patch)
treeb3ab1ea110fadbbcdffbae0cd9f32cc08d61cd61 /builtin-apply.c
parent0e9ee32358413feaa4e1cb664cb0a1e6d52f434f (diff)
downloadgit-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 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index a874375..0b00a98 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")) {