mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
b47dfe9e9c
Thanks to a200337 (git-am: propagate -C<n>, -p<n> options as well,
2008-12-04) and commits around it, "git am" is equipped to correctly
propagate the command line flags such as -C/-p/-whitespace across a patch
failure and restart.
It is trivial to support --directory option now, resurrecting previous
attempts by Kevin and Simon.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
21 lines
308 B
Plaintext
21 lines
308 B
Plaintext
From: A U Thor <au.thor@example.com>
|
|
Date: Thu Dec 4 16:00:00 2008 -0800
|
|
Subject: Six
|
|
|
|
Applying this patch with --directory='frotz nitfol' should fail
|
|
|
|
diff --git i/junk/file-2 w/junk/file-2
|
|
index 06e567b..b6f3a16 100644
|
|
--- i/junk/file-2
|
|
+++ w/junk/file-2
|
|
@@ -1,7 +1,7 @@
|
|
One
|
|
2
|
|
-3
|
|
+Three
|
|
4
|
|
5
|
|
-6
|
|
+Six
|
|
7
|