How to rebase for git svn?

> Hi, I made a git svn repository from an svn repository.  Then I cloned  
> the git repository, committed some changes to the clone, and pulled back  
> to the original repository.  However, now the original repository gives  
> me conflicts whenever I run git svn rebase.  I believe this is because  
> git pull treats the other repository's commits as a branch and merges  
> them back instead of rebasing them and maintaining the type of linear  
> history that is good for playing with svn.  Any hints as to how to fix  
> this?  I think the solution is to undo the merge that resulted from the  
> pull, but I don't know how to do this.
>
> I wrote a simple script reproducing exactly what's going on (along with  
> a transcript of its output).  I tried to make it as simple as possible,  
> but it can probably be simplified even more to reproduce the problem:
>
> http://assorted.svn.sourceforge.net/viewvc/assorted/sandbox/trunk/src/git/gitsvn.bash?revision=1057&view=markup
>
> Thanks in advance for any help!

> 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.

> 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'.

> 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