On Thu, Dec 15, 2016 at 09:36:17AM -0800, Junio C Hamano wrote:
> > Did you want me to send a v4 to mark the strings for translation or
> > will you apply a fixup your end?
>
> I didn't follow the _() discussion (was there any?)
I think the discussion was just "we should do that".
> I do not th
Chris Packham writes:
> On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano wrote:
>> The last one 3/3 is a nice touch that makes sure that we do not
>> forget what we discovered during the discussion. Very much
>> appreciated.
>>
>> Will queue. Thanks.
>
> Did you want me to send a v4 to mark the
On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano wrote:
> The last one 3/3 is a nice touch that makes sure that we do not
> forget what we discovered during the discussion. Very much
> appreciated.
>
> Will queue. Thanks.
Did you want me to send a v4 to mark the strings for translation or
will y
The last one 3/3 is a nice touch that makes sure that we do not
forget what we discovered during the discussion. Very much
appreciated.
Will queue. Thanks.
Jeff King writes:
> So not too bad (and you could probably refactor it to avoid some of the
> duplication). Though it does get some obscure cases wrong, like:
>
> git merge --continue --verbose --quiet
>
> I dunno. Maybe I am leading you down a rabbit hole, and we should just
> live with silent
On Wed, Dec 14, 2016 at 09:37:55PM +1300, Chris Packham wrote:
> + if (continue_current_merge) {
> + int nargc = 1;
> + const char *nargv[] = {"commit", NULL};
> +
> + if (orig_argc != 2)
> + usage_msg_opt("--continue expects no arguments
Teach 'git merge' the --continue option which allows 'continuing' a
merge by completing it. The traditional way of completing a merge after
resolving conflicts is to use 'git commit'. Now with commands like 'git
rebase' and 'git cherry-pick' having a '--continue' option adding such
an option to 'gi
7 matches
Mail list logo
