Merge pull request #3520 from bacongobbler/use-merges-for-changelog

Matthew Fisher · Matthew Fisher · commit 49969455504b · 2015-04-20T15:39:43.000-07:00
ref(contrib): use merges for changelog summmaries
diff --git a/contrib/util/generate-changelog.sh b/contrib/util/generate-changelog.sh
@@ -24,7 +24,7 @@ retrieve() {
         # Echo all this in a way that makes the commit hash and message a link
         # to the commit in markdown
         echo ' -' "[\`$commit\`]($LINK)" "$SUBSYSTEM": "$MESSAGE"
-    done < <(git --no-pager log --oneline --no-merges --oneline --format="%h %H %s" --grep="$1" "$FROM".."$TO")
+    done < <(git --no-pager log --oneline --merges --oneline --format="%h %H %b" --grep="$1" "$FROM".."$TO")
     # Scrape the information from git
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ retrieve() {`
`24`	`24`	`# Echo all this in a way that makes the commit hash and message a link`
`25`	`25`	`# to the commit in markdown`
`26`	`26`	echo ' -' "[\`$commit\`]($LINK)" "$SUBSYSTEM": "$MESSAGE"
`27`		`- done < <(git --no-pager log --oneline --no-merges --oneline --format="%h %H %s" --grep="$1" "$FROM".."$TO")`
	`27`	`+ done < <(git --no-pager log --oneline --merges --oneline --format="%h %H %b" --grep="$1" "$FROM".."$TO")`
`28`	`28`	`# Scrape the information from git`
`29`	`29`	`}`
`30`	`30`