From: "Stefan Schulze" <algroth@gmx.de>
To: <git@vger.kernel.org>
Subject: Moving commits from one branch to another
Date: Wed, 23 Jan 2013 13:04:03 +0100 [thread overview]
Message-ID: <000a01cdf961$bcf773d0$36e65b70$@de> (raw)
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 reply other threads:[~2013-01-23 12:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 12:04 Stefan Schulze [this message]
2013-01-23 12:12 ` Moving commits from one branch to another John Keeping
2013-01-23 14:13 ` AW: " Stefan Schulze
2013-01-23 14:49 ` John Keeping
2013-01-23 15:44 ` AW: " Schulze, Stefan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='000a01cdf961$bcf773d0$36e65b70$@de' \
--to=algroth@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).