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

Re: [PATCH] merge: default to @{upstream}

From
Bert Wesarg <bert.wesarg@googlemail.com>
Date
Jan 28, 2011, 19:53 UTC
Message-ID
<AANLkTimc92giAAJnzjv5Bq4f853xqEfLrgB=j+iRXPaf@mail.gmail.com>
In-Reply-To
<1296231457-18780-1-git-send-email-felipe.contreras@gmail.com>

On Fri, Jan 28, 2011 at 17:17, Felipe Contreras <felipe.contreras@gmail.com> wrote:

> So 'git merge' is 'git merge @{upstream}' instead of 'git merge -h';
> it's better to do something useful.

Nice idea. Could you have a look into git rebase, I think this could be applied there too.

Anyway, I think some high level sanity check won't harm. Ie. check if there is an upstream configured.

Thanks. Bert

Previous: Jonathan NiederNext: Martin von Zweigbergk
Message 7 of 9 in “merge: default to @{upstream}”
  1. merge: default to @{upstream}Felipe Contreras, Jan 28, 2011
  2. Drew NorthupJan 28, 2011
  3. Felipe ContrerasJan 28, 2011
  4. Jonathan NiederJan 28, 2011
  5. Felipe ContrerasJan 28, 2011
  6. Jonathan NiederJan 30, 2011
  7. Bert WesargJan 28, 2011
  8. Martin von ZweigbergkJan 28, 2011
  9. Miles BaderJan 31, 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.