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

Rebase with remote branch?

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Jan 16, 2014, 17:23 UTC
Message-ID
<CAHd499DQmEqt44u71xn_FPumbPpJgNmTOnhA0C4BTG_-B+9ODQ@mail.gmail.com>

I have two branches, 'master' and 'work'. 'master' I never work out of, and I merge changes into it from another SVN repository (I do not use git-svn, I do this all by hand as real git commits). My 'work' branch is technically my 'master' in the git-trunk sense, as that is my personal main line of development and I merge directly to 'master' from 'work'. I like to rebase 'work' onto 'master' but by doing so, I have to 'git push --force origin work' due to the fact that the rebase puts my current branch behind origin/work.

Should I stick to merging between 'master' and 'work' only ? Rebase is only for local-only branches, right?

Message 1 of 1 in “Rebase with remote branch?”
  1. Robert DaileyJan 16, 2014

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.