Mercurial > gnulib

annotate .gitattributes @ 37227:71cf3cc49683

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fpending: fix regression on DragonFly BSD Commit 3f5bf99e claimed that it is safe to declare __fpending twice, but in reality this caused a regression on Dragonfly BSD. Reported by GW in <https://lists.gnu.org/archive/html/bug-m4/2013-11/msg00000.html>, <https://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00022.html>. * m4/fpending.m4 (gl_FUNC_FPENDING): Check for declaration. * lib/fpending.h (__fpending): Don't declare twice. Signed-off-by: Eric Blake <eblake@redhat.com>
author Eric Blake <eblake@redhat.com>
date Fri, 08 Nov 2013 06:33:43 -0700
parents d88dc7671059
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31521
d88dc7671059 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 29385
diff changeset
1 # See lib/git-merge-changelog.c for making this useful.
29385
897cd8c32f8d Specify custom merge drivers.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
2 ChangeLog merge=merge-changelog
31521
d88dc7671059 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 29385
diff changeset
3
d88dc7671059 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 29385
diff changeset
4 # Run this to make 'git diff' on texinfo files give nicer hunk context:
d88dc7671059 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 29385
diff changeset
5 # git config diff.texinfo.funcname '^@node[ ][ ]*\\([^,][^,]*\\)'
d88dc7671059 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 29385
diff changeset
6 *.texi* diff=texinfo