Merge pull request #9847 from dra27/no-configure

Don't display configure diffs in Pull Requests
master
David Allsopp 2020-08-20 09:14:07 +01:00 committed by GitHub
commit fa577c377c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

6
.gitattributes vendored
View File

@ -29,9 +29,9 @@
/boot/menhir/parser.ml* -diff
# configure is declared as binary so that it doesn't get included in diffs.
# This also means it will have the correct Unix line-endings, even on Windows.
/configure binary
# configure is a shell-script; the linguist-generated attribute suppresses
# changes being displayed by default in pull requests.
/configure text eol=lf -diff linguist-generated
# 'union' merge driver just unions textual content in case of conflict
# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/

2
configure generated vendored
View File

@ -2811,7 +2811,7 @@ instrumented_runtime_ldlibs=""
## Source directory
## Directory containing auxiliary scripts used dugring build
## Directory containing auxiliary scripts used during build
ac_aux_dir=
for ac_dir in build-aux "$srcdir"/build-aux; do
if test -f "$ac_dir/install-sh"; then

View File

@ -68,7 +68,7 @@ instrumented_runtime_ldlibs=""
## Source directory
AC_CONFIG_SRCDIR([runtime/interp.c])
## Directory containing auxiliary scripts used dugring build
## Directory containing auxiliary scripts used during build
AC_CONFIG_AUX_DIR([build-aux])
## Output variables