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

Re: [PATCH] rebase: use @{upstream} if no upstream specified

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Feb 9, 2011, 04:17 UTC
Message-ID
<20110209041737.GD24346@elie>
In-Reply-To
<alpine.DEB.2.00.1102081959210.14152@debian>
Martin von Zweigbergk wrote:
> Maybe something like this on top? I put it in git-parse-remote.sh for
> now.
Thanks.  That sounds like a good place.
> Changes to the text compared to before:
>
>  * "remote branch" became "upstream branch", even for git pull

Sensible for pull --rebase. I'm not so sure about plain pull --- what if I am upstream and pulling from downstream?

>  * "You asked me to pull" became "You asked me to merge" or "You asked
>    me to rebase", even for git pull

"To pull" would be clearer if the reader is new and unfamiliar with the details.

>  * Now printed to stderr, because I simply didn't think about it. Good
>    or bad?
If this were a new message, I'd say stderr is better.

As is, the change to stderr seems relatively harmless, though I haven't thought about it deeply. But a part of me likes to see functional changes isolated in separate commits to make tracking down bugs a little easier.

Hope that helps, Jonathan

Previous: Martin von ZweigbergkNext: Martin von Zweigbergk
Message 8 of 12 in “rebase: use @{upstream} if no upstream specified”
  1. rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk, Feb 8, 2011
  2. Sverre RabbelierFeb 8, 2011
  3. Martin von ZweigbergkFeb 8, 2011
  4. Sverre RabbelierFeb 8, 2011
  5. Jonathan NiederFeb 8, 2011
  6. Martin von ZweigbergkFeb 9, 2011
  7. Martin von ZweigbergkFeb 9, 2011
  8. Jonathan NiederFeb 9, 2011
  9. Martin von ZweigbergkFeb 10, 2011
  10. rebase: use @{upstream} if no upstream specifiedMartin von Zweigbergk, Feb 10, 2011
  11. Junio C HamanoFeb 10, 2011
  12. Martin von ZweigbergkFeb 10, 2011

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.