Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > There might be some way I haven't thought of, in particular maybe you > can use gitattributes to define a custom diff/merge driver that always > reports no changes, or some ways to (ab)use the index to make git > ignore any changes to the file. Why does this have to be so difficult? Ship a config.h.sample file, have a Makefile rule that is forced to run before any compilation happens that checks if config.h exists and then created it if missing by copying config.h.sample over, and then all other source files can include config.h without having to know anything about config.h.sample's existence. Did I miss something?