From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 30 Dec 2008 13:44:40 GMT
Subject: Re: [PATCH] git-cherry: make <upstream> parameter optional
Message-ID: <alpine.DEB.1.00.0812301441510.30769@pacific.mpi-cbg.de>
In-Reply-To: <200812301437.06726.markus.heidelberg@web.de>

Hi,

On Tue, 30 Dec 2008, Markus Heidelberg wrote:

> Johannes Schindelin, 30.12.2008:
> 
> > On Mon, 29 Dec 2008, Markus Heidelberg wrote:
> > 
> > > The upstream branch <upstream> now defaults to the first tracked 
> > > remote branch, which is set by the configuration variables 
> > > branch.<name>.remote and branch.<name>.merge of the current branch.
> > > 
> > > Without such a remote branch, the command "git cherry [-v]" fails 
> > > with usage output as before and an additional message.
> > > 
> > > Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
> > 
> > This would be a massively visible user interface change.  At the moment, 
> > it does this (which I like):
> > 
> > 	$ git cherry-pick
> > 	usage: git cherry-pick [options] <commit-ish>
> > 
> > 	    -n, --no-commit       don't automatically commit
> > 	    -e, --edit            edit the commit message
> > 	    -x                    append commit name when cherry-picking
> > 	    -r                    no-op (backward compatibility)
> > 	    -s, --signoff         add Signed-off-by:
> > 	    -m, --mainline <n>    parent number
> 
> The patch was about git-cherry, not git-cherry-pick.

Oops.

Sorry,
Dscho

P.S.: This certainly will not be the last time that I am bitten by the 
closeness of the names "cherry" (which I _never_ use) and "cherry-pick", 
which I use frequently.  Even worse: the rev-list option that could make 
that stand-alone plumbing command "cherry" obsolete is called 
_--cherry-pick_, of all things...