On 9 June 2015 at 20:09, Andrew Fish <af...@apple.com> wrote: > > On Jun 9, 2015, at 10:50 AM, Ard Biesheuvel <ard.biesheu...@linaro.org> > wrote: > > Turns out git has a trick for this up its sleeve: see gitattributes(5). > > (1) Edit your .git/info/attributes file, adding the following lines: > > *.dec diff=ini > *.dsc diff=ini > *.dsc.inc diff=ini > *.fdf diff=ini > *.fdf.inc diff=ini > *.inf diff=ini > > (2) in your .git/config, add > > [diff "ini"] > xfuncname = "^\\[[A-Za-z0-9_., ]+]" > > > Nice find! Very useful indeed. > > > Can we check this into git to make it the default for the project? >
The attributes file could also live in $WORKSPACE/.gitattributes, so that part can easily be checked in. The config snippet could be added to $WORKSPACE/.gitconfig (or any other file), and included by the repo config by doing something like git config --add include.path ../.gitconfig Something like this could perhaps be added to edksetup.___ or some other script that is involved in setting up the workspace -- Ard. ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel