Tianocore/edk2.git/BaseTools/Conf/diff.order, branch trunk

BaseTools: convert diff.order to LF-only

2020-07-03T11:20:01+00:00

SetupGit.py sets the git config option diff.orderFile to {edk2 directory}/BaseTools/Conf/diff.order, to override the default order in which files are shown in a diff/patch/whatever. This is in imitation of what is done manually in Laszlo's Unkempt Guide. However, the version currently in the tree is in CRLF format, which makes git interpret e.g. *.c as matching on *.c, finding no matches and failing to apply the desired reordering. Note: this is true regardless of whether running on Linux or Windows. Convert the file to LF-only to make it work as expected. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao

BaseTools: fix line endings in SetupGit.py Conf files

2019-10-04T10:18:22+00:00

A file header license/copyright header copied around in commit 5b3e695d8ac5 ("BaseTools: add centralized location for git config files") was missing a CR - add it in both faulty locations. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm Reviewed-by: Bob Feng Reviewed-by: Liming Gao Acked-by: Ard Biesheuvel Reviewed-by: Philippe Mathieu-Daude

BaseTools: add centralized location for git config files

2019-06-12T02:10:10+00:00

Before adding the git environment initialization script, add the following files that will be pointed to after running said script: - BaseTools/Conf/diff.order - BaseTools/Conf/gitattributes Signed-off-by: Leif Lindholm Reviewed-by: Laszlo Ersek Reviewed-by: Bob Feng