Re: Script to rebase branches

2017-05-09 Thread Jeff King
On Tue, May 09, 2017 at 02:32:37PM +0200, Johannes Schindelin wrote: > > I didn't really expect anybody to use it verbatim, though. I was > > providing it more for inspiration. > > I deem it part of Git's mission is to avoid forcing everybody to write > scripts so specific to their own needs

Re: Script to rebase branches

2017-05-09 Thread Jeff King
On Wed, May 10, 2017 at 07:47:26AM +0900, Junio C Hamano wrote: > > Yes, the script predates the invention of worktrees by several years. I > > have occasionally played with worktrees, but don't use them extensively > > (I'd usually use them for a one-off change, and then remove the > >

Re: Script to rebase branches

2017-05-09 Thread Junio C Hamano
Jeff King writes: >> That requires Meta/ to be checked out and up-to-date. I'd bet there are >> exactly two people who fall into that category. > > Actually, it is not Junio's Meta that needs checked out, but rather the > "meta" branch where you will find that "rebase" script. If

Re: Script to rebase branches

2017-05-09 Thread Johannes Schindelin
Hi Peff, On Tue, 9 May 2017, Jeff King wrote: > On Tue, May 09, 2017 at 12:50:22PM +0200, Johannes Schindelin wrote: > > > > This is what I use: > > > > > > https://github.com/peff/git/blob/meta/rebase > > > > > > There's no documentation in the script, but the commit message in its > > >

Re: Script to rebase branches

2017-05-09 Thread Jeff King
On Tue, May 09, 2017 at 12:50:22PM +0200, Johannes Schindelin wrote: > > This is what I use: > > > > https://github.com/peff/git/blob/meta/rebase > > > > There's no documentation in the script, but the commit message in its > > history should give a good sense of what each part does. > >

Re: Script to rebase branches

2017-05-09 Thread Johannes Schindelin
Hi Peff, On Tue, 9 May 2017, Jeff King wrote: > On Sat, May 06, 2017 at 12:23:32PM +0200, Lars Schneider wrote: > > > I am about to write a bash/sh script that helps me to rebase a bunch of > > branches (e.g. select branches based on prefix, conflict resolution/ > > rerere support, ...). > >

Re: Script to rebase branches

2017-05-08 Thread Jeff King
On Sat, May 06, 2017 at 12:23:32PM +0200, Lars Schneider wrote: > I am about to write a bash/sh script that helps me to rebase a bunch of > branches (e.g. select branches based on prefix, conflict resolution/ > rerere support, ...). > > I wonder if anyone has such a script already and is

Re: Script to rebase branches

2017-05-06 Thread Dennis Kaarsemaker
On Sat, 2017-05-06 at 12:23 +0200, Lars Schneider wrote: > Hi, > > I am about to write a bash/sh script that helps me to rebase a bunch of > branches (e.g. select branches based on prefix, conflict resolution/ > rerere support, ...). > > I wonder if anyone has such a script already and is

Script to rebase branches

2017-05-06 Thread Lars Schneider
Hi, I am about to write a bash/sh script that helps me to rebase a bunch of branches (e.g. select branches based on prefix, conflict resolution/ rerere support, ...). I wonder if anyone has such a script already and is willing to share it. Thanks, Lars