git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to rebase for git svn?

From
Björn Steinbrink <b.steinbrink@gmx.de>
Date
Nov 6, 2008, 10:24 UTC
Message-ID
<20081106102425.GA4192@atjola.homenet>
In-Reply-To
<bd6139dc0811060215j1ad7ee0ahd0b568283da06cb@mail.gmail.com>
On 2008.11.06 11:15:21 +0100, Sverre Rabbelier wrote:
Show 10 quoted lines
> 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
Previous: Sverre RabbelierNext: Yang Zhang
Message 4 of 5 in “How to rebase for git svn?”
  1. Yang ZhangNov 5, 2008
  2. Eric WongNov 6, 2008
  3. Sverre RabbelierNov 6, 2008
  4. Björn SteinbrinkNov 6, 2008
  5. Yang ZhangNov 6, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.