Hi, On Sat, Jan 16, 2010 at 12:18 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Tay Ray Chuan <rctay89@xxxxxxxxx> writes: >> >>> After all, there's already the config called branch.autosetupmerge and >>> branch.autosetuprebase. >> >> Do you mean Ilari's patch already sets up branch.name.rebase for people >> with branch.autosetuprebase true? > > I checked; the patch uses install_branch_config() so it should get this > right automatically. ok, then ignore my suggestion about --setup-merge and --setup-rebase. I guess Nanako's query about 'pull --rebase' is settled as well. -- Cheers, Ray Chuan -- 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