From b47dfe9e9c86be97fc07c4c04e26a303730f76c6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 11 Jan 2009 22:21:48 -0800 Subject: git-am: add --directory= option Thanks to a200337 (git-am: propagate -C, -p 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 --- t/t4252/am-test-5-2 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 t/t4252/am-test-5-2 (limited to 't/t4252/am-test-5-2') diff --git a/t/t4252/am-test-5-2 b/t/t4252/am-test-5-2 new file mode 100644 index 0000000000..373025bcf6 --- /dev/null +++ b/t/t4252/am-test-5-2 @@ -0,0 +1,15 @@ +From: A U Thor +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 -- cgit v1.2.3