On Mon, Feb 19, 2007 at 06:28:40PM -0500, Pavel Roskin wrote: > > I think the fail-safe solution would be to leave the old behaviour > > (i.e. git-pull and pull-does-rebase=no) and people that need to pull > > from branches like that described above would use the fetch+rebase > > approach. Ideally, we'll have this configurable per-branch (and could > > leave the global one as well if the most specific is not available, > > but should default to git-pull). > > By the way, it would be great to reduce all complexity to "one bit" per > branch. If stgit.internal-pull (the name is subject to improvement) is > on, "stgit pull" calls git-fetch and does rebase. Otherwise, it calls > git-pull. No need to configure two variables per branch. Being able to specify the command to use makes it possible to hook to other SCM's (eg. using git-cvsimport, git-svn or similar). I'll try to adapt by stg-cvs script to fit into this model some day (indeed, "pullcmd = stg-cvs fetch" may indeed already work). Best regards, -- Yann. - 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