Hi Stephen,
On Wed, 17 Aug 2016, Stephen Morton wrote:
> > multiple_commits = (todo_list->next) != NULL;
> > Why not "last_commit" instead of "multiple_commits"?
>
> Because it *isn't*.
Personally, I do prefer to have the simpler instruction if the commit
happens to be the last one cherry-picke
Remi Galan Alfonso
writes:
> Either way (3 or 4 lines) I find it strange to have both advices
> start in the same way except that one is split and not the other.
True.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More maj
Stephen Morton writes:
> [snip]
> On 2016-08-16 4:44 AM, Remi Galan Alfonso wrote:
>> Hi Stephen,
>>
>> Stephen Morton writes:
>>> +if (multiple_commits)
>>> + advise(_("after resolving the conflicts,
>>> mark the corrected paths with 'git ad
Responding to a few comments...
On 2016-08-14 7:44 AM, Christian Couder wrote:
multiple_commits)
... but here multiple_commits is the last argument.
It would be better if it was more consistent.
(Johannes made the same comment.)
Yes. Will do.
multiple_commits = (todo_list->next) != NULL;
Wh
Hi,
On Tue, 16 Aug 2016, Remi Galan Alfonso wrote:
> Stephen Morton writes:
> > +if (multiple_commits)
> > + advise(_("after resolving the conflicts,
> > mark the corrected paths with 'git add ' or 'git rm '\n"
> > +
Hi Stephen,
Stephen Morton writes:
> +if (multiple_commits)
> + advise(_("after resolving the conflicts,
> mark the corrected paths with 'git add ' or 'git rm '\n"
> +"then continue with 'git %s
> --con
Hi Stephen,
On Wed, Aug 10, 2016 at 9:21 PM, Stephen Morton
wrote:
>
> Formatting on previous email was terrible, plus the diff wasn't performed
> against origin. Re-sending.
Thanks for working on this...
> (Finally getting back to this.)
>
> Something like the diff below, then Johannes?
...bu
On Mon, Aug 1, 2016 at 5:12 AM, Johannes Schindelin
wrote:
> Hi Stephen,
>
> On Wed, 27 Jul 2016, Stephen Morton wrote:
>
>> On Wed, Jul 27, 2016 at 11:03 AM, Johannes Schindelin
>> wrote:
>> >
>> > On Wed, 27 Jul 2016, Stephen Morton wrote:
>> >
>> >> diff --git a/sequencer.c b/sequencer.c
>> >>
On Mon, Aug 1, 2016 at 5:12 AM, Johannes Schindelin
wrote:
Hi Stephen,
On Wed, 27 Jul 2016, Stephen Morton wrote:
On Wed, Jul 27, 2016 at 11:03 AM, Johannes Schindelin
wrote:
>
> On Wed, 27 Jul 2016, Stephen Morton wrote:
>
>> diff --git a/sequencer.c b/sequencer.c
>> index cdfac82..ce
Hi Stephen,
On Wed, 27 Jul 2016, Stephen Morton wrote:
> On Wed, Jul 27, 2016 at 11:03 AM, Johannes Schindelin
> wrote:
> >
> > On Wed, 27 Jul 2016, Stephen Morton wrote:
> >
> >> diff --git a/sequencer.c b/sequencer.c
> >> index cdfac82..ce06876 100644
> >> --- a/sequencer.c
> >> +++ b/sequence
On Wed, Jul 27, 2016 at 11:03 AM, Johannes Schindelin
wrote:
> Hi Stephen,
>
> On Wed, 27 Jul 2016, Stephen Morton wrote:
>
>> Here is my patch then. (Personally, I would add some capitalization and
>> punctuation, but I didn't see much of that in the existing code.) I'm
>> not a regular pull-requ
Hi Stephen,
On Wed, 27 Jul 2016, Stephen Morton wrote:
> Here is my patch then. (Personally, I would add some capitalization and
> punctuation, but I didn't see much of that in the existing code.) I'm
> not a regular pull-requester, do I do that, or can somebody else handle
> that for me?
The pr
Here is my patch then. (Personally, I would add some capitalization
and punctuation, but I didn't see much of that in the existing code.)
I'm not a regular pull-requester, do I do that, or can somebody else
handle that for me?
diff --git a/sequencer.c b/sequencer.c
index cdfac82..ce06876 100644
-
On Tue, Jul 26, 2016 at 4:30 PM, Jeff King wrote:
> On Tue, Jul 26, 2016 at 01:18:55PM -0700, Stefan Beller wrote:
>
>> > Would it be possible to expand the hint message to tell users to run
>> > 'git cherry-pick --continue'
>>
>> Instead of expanding I'd go for replacing?
>>
>> I'd say the user i
On Tue, Jul 26, 2016 at 01:18:55PM -0700, Stefan Beller wrote:
> > Would it be possible to expand the hint message to tell users to run
> > 'git cherry-pick --continue'
>
> Instead of expanding I'd go for replacing?
>
> I'd say the user is tempted for 2 choices,
> a) aborting (for various reason
> Would it be possible to expand the hint message to tell users to run
> 'git cherry-pick --continue'
Instead of expanding I'd go for replacing?
I'd say the user is tempted for 2 choices,
a) aborting (for various reasons)
b) fix and continue.
So we'd want to point out the way for those two ways
When I cherry-pick n commits and one of the first (n-1), fails, what I
should do is resolve the conflict, 'git add' it, and then run 'git
cherry-pick --continue'. However git advises me to
error: could not apply d0fb756... Commit message for test commit
hint: after resolving the conflicts, mark th
17 matches
Mail list logo
