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

Moving commits from one branch to another

From
SSStefan Schulze <algroth@gmx.de>
Date
Jan 23, 2013, 12:04 UTC
Message-ID
<000a01cdf961$bcf773d0$36e65b70$@de>
Hi,

my team uses a central git-repo since >1500 commits and now we have to sync (only one-way is necessary for now) our repository every three weeks with an external svn-repo. I created the new base-directory (incl. trunk/tags/branches) in svn and added it to my local repo using git svn init && git fetch. Now I have two branches in my local repository (master and "svnbranch") and cherry-picked the very first commit from master to svnbranch (it was probably not necessary), tagged this commit as "publishedToSvn". Now I want to add all commits publishedToSvn..master onto svnbranch. I didn't managed to succeed using git-rebase (probably because of the missing common commits?) and using git grafts / filter-branch modifies my already published master.

Is there any way to move/copy commits from one branch to another without a common base-commit and without a forced push of master?

Thanks in advance,
  Stefan Schulze
Next: John Keeping
Message 1 of 5 in “Moving commits from one branch to another”
  1. Stefan SchulzeJan 23, 2013
  2. John KeepingJan 23, 2013
  3. AW: Moving commits from one branch to anotherStefan Schulze, Jan 23, 2013
  4. John KeepingJan 23, 2013
  5. AW: Moving commits from one branch to anotherSchulze, Stefan, Jan 23, 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.