summaryrefslogtreecommitdiff
path: root/pavement.py
diff options
context:
space:
mode:
Diffstat (limited to 'pavement.py')
-rw-r--r--pavement.py5
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')