git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-cherry: make <upstream> parameter optional

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 30, 2008, 13:44 UTC
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:
Show 27 quoted lines
> 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...

Previous: Markus HeidelbergNext: demerphq
Message 4 of 7 in “git-cherry: make <upstream> parameter optional”
  1. git-cherry: make <upstream> parameter optionalMarkus Heidelberg, Dec 29, 2008
  2. Johannes SchindelinDec 30, 2008
  3. Markus HeidelbergDec 30, 2008
  4. Johannes SchindelinDec 30, 2008
  5. demerphqDec 30, 2008
  6. Junio C HamanoJan 1, 2009
  7. Markus HeidelbergJan 1, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.