Add *.md diff=md.

2020-01-15  Segher Boessenkool  <segher@kernel.crashing.org>
	    Jakub Jelinek  <jakub@redhat.com>

	* .gitattributes: Add *.md diff=md.
contrib/
	* gcc-git-customization.sh: Change uses to use in comment.

diff --git a/.gitattributes b/.gitattributes
index 13debfd97e95a6390bbbf4a33566d70a2eb6eb10..e75bfc595bfb1ec14c364a650df08253f24beecc 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,7 @@
 *.[cCh] whitespace=indent-with-non-tab,space-before-tab,trailing-space
 *.cc whitespace=indent-with-non-tab,space-before-tab,trailing-space
 ChangeLog whitespace=indent-with-non-tab,space-before-tab,trailing-space
+# Make diff on MD files use "(define" as a function marker.
+# Use together with git config diff.md.xfuncname '^\(define.*$'
+# which is run by contrib/gcc-git-customization.sh too.
+*.md diff=md

diff --git a/ChangeLog b/ChangeLog
index 31fc7a260dd1bfc33feff0edb15eb233a70dedbc..265b407bc7213caa7a173c496369099ff34b603a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-15  Segher Boessenkool  <segher@kernel.crashing.org>
+           Jakub Jelinek  <jakub@redhat.com>
+
+       * .gitattributes: Add *.md diff=md.
+
 2020-01-14  Georg-Johann Lay  <avr@gjlay.de>
 
        The mentioned auto-generated file is no more part of the

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 886d197af59eb34d79758f4c50bd1d586889e4c4..b8ea20f101e378158471fb40029f7ef05c92894c 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-15  Segher Boessenkool  <segher@kernel.crashing.org>
+           Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc-git-customization.sh: Change uses to use in comment.
+
 2020-01-15  Jakub Jelinek  <jakub@redhat.com>
 
        * gcc-git-customization.sh: Handle output of older git which doesn't

diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh
index af7d210217f9a5deb227f8478f767cc879530586..f4261592b1d1a1f07273ebc1d5907b7968394849 100755 (executable)
--- a/contrib/gcc-git-customization.sh
+++ b/contrib/gcc-git-customization.sh
@@ -25,7 +25,7 @@ git config alias.svn-rev '!f() { rev=$1; shift; git log --all --grep="From-SVN:
 git config alias.gcc-descr \!"f() { if test \${1:-no} = --full; then r=\$(git describe --all --abbrev=40 --match 'basepoints/gcc-[0-9]*' \${2:-master} | sed -n 's,^\\(tags/\\)\\?basepoints/gcc-,r,p'); expr match \${r:-no} '^r[0-9]\\+\$' >/dev/null && r=\${r}-0-g\$(git rev-parse \${2:-master}); test -n \$r && echo \${r}; else git describe --all --match 'basepoints/gcc-[0-9]*' \${1:-master} | sed -n 's,^\\(tags/\\)\\?basepoints/gcc-\\([0-9]\\+\\)-\\([0-9]\\+\\)-g[0-9a-f]*\$,r\\2-\\3,p;s,^\\(tags/\\)\\?basepoints/gcc-\\([0-9]\\+\\)\$,r\\2-0,p'; fi; }; f"
 git config alias.gcc-undescr \!"f() { o=\$(git config --get gcc-config.upstream); r=\$(echo \$1 | sed -n 's,^r\\([0-9]\\+\\)-[0-9]\\+\$,\\1,p'); n=\$(echo \$1 | sed -n 's,^r[0-9]\\+-\\([0-9]\\+\\)\$,\\1,p'); test -z \$r && echo Invalid id \$1 && exit 1; h=\$(git rev-parse --verify --quiet \${o:-origin}/releases/gcc-\$r); test -z \$h && h=\$(git rev-parse --verify --quiet \${o:-origin}/master); p=\$(git describe --all --match 'basepoints/gcc-'\$r \$h | sed -n 's,^\\(tags/\\)\\?basepoints/gcc-[0-9]\\+-\\([0-9]\\+\\)-g[0-9a-f]*\$,\\2,p;s,^\\(tags/\\)\\?basepoints/gcc-[0-9]\\+\$,0,p'); git rev-parse --verify \$h~\$(expr \$p - \$n); }; f"
 
-# Make diff on MD files uses "(define" as a function marker.
+# Make diff on MD files use "(define" as a function marker.
 # Use this in conjunction with a .gitattributes file containing
 # *.md    diff=md
 git config diff.md.xfuncname '^\(define.*$'