Re: [PATCH v2 0/2] [doc] Remove gittutorial-2

[Tuomas Ahola <taahol@utu.fi>]

Junio C Hamano <gitster@pobox.com> wrote:

> Tuomas Ahola <taahol@utu.fi> writes:
> 
> > And let's not worry about that exception you mentioned.  After this topic hits
> > 'next', I can rebase mine on top on of this, and deal with all necessary
> > integration work.
> 
> OK.  So ...
> 
>  - I'll tentatively eject both topics out of my tree,
> 
>  - Julia will send in a replacement that does not add gittutorial-2
>    to the command-list, which will be merged to 'next',
> 
>  - and then your topic will be queued again with an evil merge (by
>    me) to add gittutorial-2 back to the command-list file.
> 
> ... and both topics will be happy?

With an evil merge, or by stacking my topic on top of Julia's---which I think
is the cleaner solution because that way I can add gt-2 as a linter exemption
in the patch itself and explain it in the commit message.

And if "back to the command-list file" wasn't just a thinko, then no, I don't
see that gt-2 should be re-added to command-list.txt.