Quoting Jay Soffian <jaysoffian@xxxxxxxxx>: > On Sat, Mar 14, 2009 at 9:23 PM, Daniel Jacobs <djacobs7@xxxxxxxxx> wrote: >> I would like it if every file was merged, except for files that were explictly >> excluded from a merge between these two branches. Is there a good way to do >> this? > > Please see http://thread.gmane.org/gmane.comp.version-control.git/110488 > (Is there a way to exclude user-specified files or directories from > participating in merges?) > > I believe it is the same use case, and Junio provided a very detailed reply. Would it help to have the final summary by Sitaram Chamarty http://article.gmane.org/gmane.comp.version-control.git/110697 somewhere under Documentation/howto? -- 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
