Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > On Mon, 26 Feb 2007, Shawn O. Pearce wrote: > > > Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > > Therefore, I wrote this extremely simple script to sort out the order of > > > commits, and possibly merging some. The script lets you edit the commit > > > list upon start (reordering it, or removing commits), and then works on > > > that list. It has three subcommands: > > > > This simple tool rocks. Thank you! ;-) > > I am undecided how to continue. Originally, I wanted to add an "--onto > <commit>" option, and maybe an "edit" subcommand, but since Junio made me > realize that it is more similar to git-rebase than I previously thought, > and that they should merge, possibly in the form of a builtin... Yea - this is a lot like rebase. I was also thinking that the -m (merge mode) in rebase probably should be the only option offered. I don't see why rebase should format-patch|am when we have the whole commit available and merge-recursive does an excellent job on tree level merges. > But in order to merge the two, I have to learn about rebase's syntax first > ;-) Its easier than it looks. ;-) -- Shawn. - 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