diff options
| author | NIIBE Yutaka <[email protected]> | 2012-06-15 07:50:45 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2012-06-15 07:50:45 +0000 |
| commit | 29b431fcf97a9e615d34a7a40e570e63834b360a (patch) | |
| tree | ca953529482bfa390549762552b59fd3aea10320 | |
| parent | scd: Fix merge mistake. (diff) | |
| parent | Fix generated ChangeLog entry. (diff) | |
| download | gnupg-29b431fcf97a9e615d34a7a40e570e63834b360a.tar.gz gnupg-29b431fcf97a9e615d34a7a40e570e63834b360a.zip | |
Merge branch 'scd-backport-2-0' of git+ssh://playfair.gnupg.org/git/gnupg into scd-backport-2-0
| -rw-r--r-- | scripts/git-log-fix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/git-log-fix b/scripts/git-log-fix index af702fe6f..6760e8632 100644 --- a/scripts/git-log-fix +++ b/scripts/git-log-fix @@ -1,3 +1,10 @@ # 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. + +08178d1e130a856622c0b938a34eb109bde79262 +s/Conflicts:/--/ + +dafa7aa621dfe36c5c6cf462d3ec0d6c614ab105 +# Fix old cherry-picked message. +s/(fix wLangId in.*)/\1\n--/ |