From: "Jean-Baptiste Quenot" <jbq@caraldi.com>
To: "Joe Fiorini" <joe@faithfulgeek.org>
Cc: git@vger.kernel.org
Subject: Re: git-svn merging into branch?
Date: Fri, 28 Mar 2008 09:34:33 +0100 [thread overview]
Message-ID: <ae63f8b50803280134v1d24854dwacd21a1ef95951ed@mail.gmail.com> (raw)
In-Reply-To: <B3FD53D6-CB70-4D21-ACE2-7B9D4B19F675@faithfulgeek.org>
You can either use SVN-specific tools, namely svn merge or svnmerge,
or GIT-specific tools, namely git merge, git rebase or git cherry
pick. If you choose the latter, once done you can simply git-svn
dcommit your changes.
Cheers,
--
Jean-Baptiste Quenot
http://caraldi.com/jbq/blog/
prev parent reply other threads:[~2008-03-28 8:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-27 17:30 git-svn merging into branch? Joe Fiorini
2008-03-28 6:32 ` Joe Fiorini
2008-03-28 8:34 ` Jean-Baptiste Quenot [this message]
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=ae63f8b50803280134v1d24854dwacd21a1ef95951ed@mail.gmail.com \
--to=jbq@caraldi.com \
--cc=git@vger.kernel.org \
--cc=joe@faithfulgeek.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).