summaryrefslogtreecommitdiff
path: root/t/t4252
diff options
context:
space:
mode:
authormartin f. krafft <madduck@madduck.net>2009-01-23 00:31:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-24 01:00:12 (GMT)
commitb80da424a13107c239ed40573fae3d692d19b6cd (patch)
tree48fd506aeee6cc46c23f2c0b1ef43db37b382ae0 /t/t4252
parentd930508903909ad5e700dd25e3858a1b2d69ed12 (diff)
downloadgit-b80da424a13107c239ed40573fae3d692d19b6cd.zip
git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.gz
git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.bz2
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 <madduck@madduck.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4252')
-rw-r--r--t/t4252/am-test-6-121
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t4252/am-test-6-1 b/t/t4252/am-test-6-1
new file mode 100644
index 0000000..a8859e9
--- /dev/null
+++ b/t/t4252/am-test-6-1
@@ -0,0 +1,21 @@
+From: A U Thor <au.thor@example.com>
+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