From: Yang Zhang <yanghatespam@gmail.com>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: sverre@rabbelier.nl, Eric Wong <normalperson@yhbt.net>,
git@vger.kernel.org
Subject: Re: How to rebase for git svn?
Date: Thu, 06 Nov 2008 15:05:46 -0500 [thread overview]
Message-ID: <49134E1A.9090908@gmail.com> (raw)
In-Reply-To: <20081106102425.GA4192@atjola.homenet>
Björn Steinbrink wrote:
> On 2008.11.06 11:15:21 +0100, Sverre Rabbelier wrote:
>> On Thu, Nov 6, 2008 at 10:55, Eric Wong <normalperson@yhbt.net> wrote:
>>> Yang Zhang <yanghatespam@gmail.com> wrote:
>>>> Thanks in advance for any help!
>>> Try passing --rebase or --squash with "git pull" to keep history linear
>>> for SVN.
>> Consider doing the following:
>> git config alias.repull "pull --rebase"
>> And then using 'git repull' instead of 'git pull'.
>
> Or set branch.<name>.rebase in your config and just use "git pull" ;-)
> Setting branch.autosetuprebase might also be useful in that case.
>
> You should be careful to make sure that the other side does not lag
> behind WRT svn, though. Otherwise, you end up rebasing commits that
> corresponds to svn revisions. Bad.
>
> Björn
git pull --rebase doesn't seem to be working either....
http://assorted.svn.sourceforge.net/viewvc/assorted/sandbox/trunk/src/git/gitsvn.bash?revision=1064&view=markup
--
Yang Zhang
http://www.mit.edu/~y_z/
prev parent reply other threads:[~2008-11-06 20:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-05 19:09 How to rebase for git svn? Yang Zhang
2008-11-06 9:55 ` Eric Wong
2008-11-06 10:15 ` Sverre Rabbelier
2008-11-06 10:24 ` Björn Steinbrink
2008-11-06 20:05 ` Yang Zhang [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=49134E1A.9090908@gmail.com \
--to=yanghatespam@gmail.com \
--cc=B.Steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=sverre@rabbelier.nl \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.