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

Re: [PATCH] fetch: add new fetch.default configuration

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
May 19, 2013, 11:51 UTC
Message-ID
<CALkWK0nQzEK6-E7aMnGg6eYZJ_=XsE6FBmRgu9_8jBGkYmJe+Q@mail.gmail.com>
In-Reply-To
<CAMP44s3pZYw87awogjjOdFRP39Ou0=td2erhV2-aC-9_A_Z75A@mail.gmail.com>
Felipe Contreras wrote:
Show 6 quoted lines
> % git checkout fc/remote/hg-next
> % git rebase -i # rebase to master
> % git checkout fc/remote/hg-notes
> % git rebase -i # rebase to fc/remote/hg-next
> % git checkout fc/remote/hg-gitifyhg-compat
> % git rebase -i # rebase to fc/remote/hg-notes

So it is rebase, but rebase.defaultUpstream = origin won't suffice. You want to specify a custom base. What I don't understand is why you're abusing @{u}, and crippling remote (by hard-interpreting it as "origin") to achieve this. For the record, I didn't think your branch.<name>.base was a bad idea at all (re-visiting now).

Previous: Felipe ContrerasNext: Felipe Contreras
Message 4 of 9 in “fetch: add new fetch.default configuration”
  1. fetch: add new fetch.default configurationFelipe Contreras, May 18, 2013
  2. Ramkumar RamachandraMay 18, 2013
  3. Felipe ContrerasMay 18, 2013
  4. Ramkumar RamachandraMay 19, 2013
  5. Felipe ContrerasMay 19, 2013
  6. Ramkumar RamachandraMay 19, 2013
  7. Felipe ContrerasMay 19, 2013
  8. Eric SunshineMay 19, 2013
  9. Felipe ContrerasJun 1, 2013

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.