Re: [PATCH] cherry-pick: don't barf when there's nothing to do

2013-06-03 Thread Junio C Hamano
Felipe Contreras writes: > If the user set --ff, it's expected that if theres's nothing to do we > fast-forward our current HEAD, which is a no-op. > > Signed-off-by: Felipe Contreras > --- This is about "git cherry-pick topic..master" which is a misspelt form of "git cherry-pick master..topic"

[PATCH] cherry-pick: don't barf when there's nothing to do

2013-05-30 Thread Felipe Contreras
If the user set --ff, it's expected that if theres's nothing to do we fast-forward our current HEAD, which is a no-op. Signed-off-by: Felipe Contreras --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index d8f9d30..b9d4b48 100644 --- a