John Keeping wrote: > On Wed, May 07, 2014 at 03:26:15PM -0500, Felipe Contreras wrote: > > Junio C Hamano wrote: > > > Your git-integrate might turn into something I could augment my > > > workflow with with some additions. > > > > > > - specifying a merge strategy per branch being merged; > > > > git-reintegrate supports this. > > > > > - support evil merges or picking a fix-up commit; > > > > git-reintegrate supports this. > > > > > - leaving an empty commit only to leave comment in the history. > > > > Done. > > > > > > > and until that happens, I'll keep using the Reintegrate script found > > > in my 'todo' branch. > > > > My git-reintegrate supports everything John's git-integrate and in > > addition it supports generating the commands from an existing branch, > > like your Reintegrate. IOW; it's superior. > > And yet the documentation is unchanged from the version you copied in > from git-integration.
Not much has changed since v0.1 since that version already worked perfectly. But I'll update it. > Personally I would much rather use a project which takes time to > document all of the features rather than relying on reading the code > to figure out the options. And I would rather use a project that concentrates on having the features users need. > More features does not make a project superior. No, better features do. Either way. Documentation updated. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html