mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
b80da424a1
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>
21 lines
266 B
Text
21 lines
266 B
Text
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
|