Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > On Fri, Mar 6, 2009 at 11:04 AM, Shawn O. Pearce <spearce@xxxxxxxxxxx> wrote: > > Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > >> The code to complete --strategy was duplicated between _git_rebase and > >> _git_merge, and is about to gain a third caller (_git_pull). This patch > >> factors it into its own function. > >> > >> Signed-off-by: Jay Soffian <jaysoffian@xxxxxxxxx> > > > > Looks OK to me, but I had to squash this in to get it to work. > > Without this the patch breaks git merge completion entirely: > > Weird, I had it completely backwards but it seemed to work. Probably > because I was sourcing the new completion into my running shell; I'll > make sure to startup a new shell next time. > > With the squash (assuming Junio doesn't mind), is it acked-by you or > should I resend? Sorry, yes, with the squash it is Ack'd. -- 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
