From: Avery Pennarun <apenwarr@gmail.com>
To: Matthias Andree <matthias.andree@gmx.de>
Cc: "David H. Lynch J.r" <ml@dlasys.net>, git@vger.kernel.org
Subject: Re: git svn rebase problem
Date: Mon, 18 May 2009 13:00:25 -0400 [thread overview]
Message-ID: <32541b130905181000v34d5fd6arcb662bff232cb81c@mail.gmail.com> (raw)
In-Reply-To: <op.ut4aagco1e62zd@merlin.emma.line.org>
On Mon, May 18, 2009 at 4:38 AM, Matthias Andree <matthias.andree@gmx.de> wrote:
> Have you been working on a branch other than the one that git-svn created
> for you? If so, you may have to "git checkout" the original branch before
> being able to "git svn rebase".
>
> Branches and git-svn don't mix.
That's not exactly true: merging and git-svn don't mix. But rebasing
works fine.
If you have a separate branch and do 'git svn rebase', then as far as
I know, the original git-svn branch(es) will get updated to the latest
version from svn, and then your current branch will be rebased on top
of it. This is often what you want, unless you've been using 'git
merge' from that branch. Rebasing (unless you know exactly what
you're doing) always messes up git merge.
Have fun,
Avery
next prev parent reply other threads:[~2009-05-18 17:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-15 21:21 git svn rebase problem David H. Lynch J.r
2009-05-15 23:53 ` Avery Pennarun
2009-05-16 3:52 ` John Tapsell
2009-05-18 8:38 ` Matthias Andree
2009-05-18 17:00 ` Avery Pennarun [this message]
2009-05-19 0:56 ` Miles Bader
-- strict thread matches above, loose matches on Subject: below --
2009-05-18 14:06 David H. Lynch J.r
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=32541b130905181000v34d5fd6arcb662bff232cb81c@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=matthias.andree@gmx.de \
--cc=ml@dlasys.net \
/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).