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

Re: RFC: git pull or git rebase?

From
MTMichael S. Tsirkin <mst@dev.mellanox.co.il>
Date
Jul 23, 2007, 09:31 UTC
Message-ID
<20070723093142.GE20614@mellanox.co.il>
In-Reply-To
<81b0412b0707230207k2fa33eb3hdc23319d1f8dbd80@mail.gmail.com>
Show 14 quoted lines
> Quoting Alex Riesen <raa.lkml@gmail.com>:
> Subject: Re: RFC: git pull or git rebase?
> 
> On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:
> >However, I wonder whether this happens to others, too.
> >Would it make sense to add a branch attribute that says
> >"do not pull this branch" or "do not rebase this branch"?
> >Maybe even make git do the right thing automatically,
> >so that git would look at this attribute and perform
> >pull or rebase as appropriate?
> 
> If you have a recent enough git, it will refuse to pull into
> a branch for which there is no configured remote branch.
> Exactly for a reason like yours.

Aha. I created the tree by git clone, so my master is configured to merge from origin automatically.

-- 
MST
Previous: Alex Riesen
Message 3 of 3 in “RFC: git pull or git rebase?”
  1. Michael S. TsirkinJul 23, 2007
  2. Alex RiesenJul 23, 2007
  3. Michael S. TsirkinJul 23, 2007

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.