From: Junio C Hamano <junkio@cox.net>
Date: Sun, 27 Aug 2006 22:53:20 +0000 (-0700)
Subject: git-apply --reject: finishing touches.
X-Git-Tag: v1.4.3-rc1~176^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8938045a4eae7a9c39631508a3c3d34c50c6257a;p=git.git

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>
---

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 11641a92e..2e2acd72c 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 a874375e7..0b00a98aa 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")) {