On Wed, Aug 25, 2010 at 9:09 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Nguyen Thai Ngoc Duy wrote: >> On Wed, Aug 25, 2010 at 8:37 AM, Jonathan Nieder <jrnieder@xxxxxxxxx> >> wrote: > >>> is it possible to >>> merge without remote contact in the boring case, when no changes have >>> occured outside the narrow tree? >> >> That's possible (and is implemented in my series). But I guess as soon >> as you do "git pull", the boring case is likely not applicable >> anymore. > > Makes sense. > > One slightly less boring case. Is it possible to merge when the > simplified history, looking only at changes outside the narrow tree, > would have permitted a fast-forward? Yes, as long as there is no changes outside narrow tree. > > If so, a git contributor who is only interested in Documentation/ > could work on "next" between releases and keep up with "maint" and > "master" longer term, without the help of a full-tree-merging machine. > > More realistically, a linux-2.6 contributor only interested in one > subsystem could always keep up with "master". Which would be nice. > -- Duy -- 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