Re: [PATCH v2] Revamp git-cherry(1)

2013-11-22 Thread Junio C Hamano
Thomas Rast writes: > Junio C Hamano writes: > >> We are listing those that need to be added to the upstream with "+", >> while listing those that can be dropped from yours if you rebase >> with "-". Hinting the rationale behind the choice of "+/-" >> somewhere may help as a mnemonic to the rea

Re: [PATCH v2] Revamp git-cherry(1)

2013-11-22 Thread Thomas Rast
Junio C Hamano writes: > We are listing those that need to be added to the upstream with "+", > while listing those that can be dropped from yours if you rebase > with "-". Hinting the rationale behind the choice of "+/-" > somewhere may help as a mnemonic to the readers (see below). [...] > And

Re: [PATCH v2] Revamp git-cherry(1)

2013-11-22 Thread Junio C Hamano
Thomas Rast writes: > NAME > > +git-cherry - Find commits not applied in upstream > > +Determine whether there are commits in `..` that are > +equivalent to those in the range `..`. > > +The equivalence test is based on the diff, after removing whitespace > +and line numbers. git-cher

[PATCH v2] Revamp git-cherry(1)

2013-11-22 Thread Thomas Rast
git-cherry(1)'s "description" section has never really managed to explain to me what the command does. It contains too much explanation of the algorithm instead of simply saying what goals it achieves, and too much terminology that we otherwise do not use (fork-point instead of merge-base). Try a