Thread (25 messages) 25 messages, 3 authors, 2016-06-15

Re: [PATCH 17/18] revert: Introduce --continue to continue the operation

flat view

From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:51:46
Subsystem: the rest · Maintainer: Linus Torvalds

Hi Christian,

Christian Couder writes:
On Thursday 04 August 2011 12:39:15 Ramkumar Ramachandra wrote:
quoted
+test_expect_success '--signoff is not automatically propogated to resolved
conflict' '
s/propogated/propagated/

I found nothing else from another look at the tests in the series so you can
add an "Acked-by: Christian Couder [off-list ref]" or "Signed-of-
by: Christian Couder [off-list ref]".
Thanks for being so thorough! :)
Junio: Here's another small fixup patch for your convenience.

--8<--
Subject: [PATCH] fixup! revert: Introduce --continue to continue the
 operation


Signed-off-by: Ramkumar Ramachandra <redacted>
---
 t/t3510-cherry-pick-sequence.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 78f3f01..3bca2b3 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -171,7 +171,7 @@ test_expect_success '--continue respects opts' '
        grep "cherry picked from" anotherpick_msg
 '

-test_expect_success '--signoff is not automatically propogated to
resolved conflict' '
+test_expect_success '--signoff is not automatically propagated to
resolved conflict' '
        pristine_detach initial &&
        test_must_fail git cherry-pick --signoff base..anotherpick &&
        echo "c" >foo &&
-- 
1.7.6.351.gb35ac.dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help