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>
16 lines
287 B
Plaintext
16 lines
287 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 succeed
|
|
|
|
diff --git i/file-5 w/file-5
|
|
new file mode 100644
|
|
index 000000..1d6ed9f
|
|
--- /dev/null
|
|
+++ w/file-5
|
|
@@ -0,0 +1,3 @@
|
|
+One
|
|
+two
|
|
+three
|