diff options
| author | Theophile Ranquet <ranquet@lrde.epita.fr> | 2012-12-06 11:43:02 +0100 |
|---|---|---|
| committer | Theophile Ranquet <ranquet@lrde.epita.fr> | 2012-12-06 13:38:43 +0100 |
| commit | f3ead217b8636f623399e66bd937b1c51774d4af (patch) | |
| tree | 074e97d4d5adbc914e312dbdb84c642d995355c4 /build-aux | |
| parent | d6dc4d36d1db744b060029254eaabaaa525a1c19 (diff) | |
| parent | 9960a6ae75842aa7836f39b59e82eef0319338bc (diff) | |
| download | bison-f3ead217b8636f623399e66bd937b1c51774d4af.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
misc: pacify the Tiny C Compiler
cpp: make the check of Flex version portable
misc: require getline
c++: support wide strings for file names
doc: document carets
tests: enhance existing tests with carets
errors: show carets
getargs: add support for --flags/-f
Conflicts:
doc/bison.texi
m4/.gitignore
src/complain.c
src/flex-scanner.h
src/getargs.c
src/getargs.h
src/gram.c
src/main.c
tests/headers.at
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/git-log-fix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix index af702fe6..72111507 100644 --- a/build-aux/git-log-fix +++ b/build-aux/git-log-fix @@ -1,3 +1,8 @@ # This file is expected to be used via gitlog-to-changelog's --amend=FILE # option. It specifies what changes to make to each given SHA1's commit # log and metadata, using Perl-eval'able expressions. + +0db2648930e3b6c376a539aabe368aade83ee29a +s/--flags/--feature/; +s/flag_flag/feature_flag/; +s/\bflag\b/feature/; |