Tom Clarke wrote: > On 8/30/07, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: >> In my TODO, there is "add the 'rebase' strategy". It is definitely >> something post-1.5.3, so I do not look into it. But the most logical >> place for me would be to have a strategy 'rebase'. IOW a >> git-merge-rebase.sh. > > The following is my first naive attempt, is this the kind of thing you > were thinking of? By the way, such strategy appeared some time ago on git mailing list IIRC as 'subjugate' (then renamed to 'rebase') merge strategy. As with all good ideas (stash, submodules) the idea returns... :-) -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
