Quoting Junio C Hamano <gitster@xxxxxxxxx>: > * xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits > + Teach git-merge -X<option> again. > + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next > + builtin-merge.c: use parse_options_step() "incremental parsing" > machinery > + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next > > This needs to be merged to master iff/when merge-theirs gets merged, > but I do not think this series is widely supported, so both are on hold. Why do you say it is not widely supported? I may be wrong but I think you developed these patches after somebody from the mailing list asked for this feature. You may find out people are enthusiastic about this only after you merge it to your master branch. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- 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
