Regenerate git-changelog man pages (.html and .1) for #471.

tj · Oct 18, 2015 · 106acae · 106acae
1 parent b804d36
commit 106acae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/man/git-changelog.1 b/man/git-changelog.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CHANGELOG" "1" "April 2015" "" ""
+.TH "GIT\-CHANGELOG" "1" "October 2015" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-changelog\fR \- Generate a changelog report
@@ -61,6 +61,12 @@ When specifying a range, the oldest tag to retrieve commits from\. Commits will
 Filters out merge commits (commits with more than 1 parent) from generated changelog\.
 .
 .P
+\-m, \-\-merges\-only
+.
+.P
+Uses only merge commits (commits with more than 1 parent) for generated changelog\. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge\.
+.
+.P
 \-p, \-\-prune\-old
 .
 .P

diff --git a/man/git-changelog.html b/man/git-changelog.html