diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2016-01-16 20:33:58 +0100 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@gmail.com> | 2016-01-16 20:33:58 +0100 |
| commit | 0bacdf63d45cafaeabc2de9fa792ff1155f3ef1f (patch) | |
| tree | 3cd47012d52826dd08c7fe68fc5f35f5dc38c9f9 | |
| parent | 4ac1a77f0730f58383ed68615e4d93933cde74f0 (diff) | |
| parent | 4a000fb061e89b289c0af145332589e0491143c9 (diff) | |
| download | numpy-0bacdf63d45cafaeabc2de9fa792ff1155f3ef1f.tar.gz | |
Merge pull request #7032 from charris/no-merges-in-changelog
REL: Do not include merge commits in Changelog.
| -rw-r--r-- | pavement.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pavement.py b/pavement.py index 45a6943fe..ace0a5c02 100644 --- a/pavement.py +++ b/pavement.py @@ -617,8 +617,9 @@ SHA256 def write_log_task(options, filename='Changelog'): st = subprocess.Popen( - ['git', 'log', '%s..%s' % (LOG_START, LOG_END)], - stdout=subprocess.PIPE) + ['git', 'log', '--no-merges', '--use-mailmap', + '%s..%s' % (LOG_START, LOG_END)], + stdout=subprocess.PIPE) out = st.communicate()[0] a = open(filename, 'w') |