From b80da424a13107c239ed40573fae3d692d19b6cd Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 23 Jan 2009 11:31:21 +1100 Subject: git-am: implement --reject option passed to git-apply With --reject, git-am simply passes the --reject option to git-apply and thus allows people to work with reject files if they so prefer. Signed-off-by: martin f. krafft Signed-off-by: Junio C Hamano --- t/t4252/am-test-6-1 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 t/t4252/am-test-6-1 (limited to 't/t4252/am-test-6-1') diff --git a/t/t4252/am-test-6-1 b/t/t4252/am-test-6-1 new file mode 100644 index 0000000000..a8859e9b8f --- /dev/null +++ b/t/t4252/am-test-6-1 @@ -0,0 +1,21 @@ +From: A U Thor +Date: Thu Dec 4 16:00:00 2008 -0800 +Subject: Huh + +Should fail and leave rejects + +diff --git i/file-2 w/file-2 +index 06e567b..b6f3a16 100644 +--- i/file-2 ++++ w/file-2 +@@ -1,3 +1,3 @@ +-0 ++One + 2 + 3 +@@ -4,4 +4,4 @@ + 4 + 5 +-6 ++Six + 7 -- cgit v1.2.3