From 106acae94377a05ca754985a819063ffff1158f9 Mon Sep 17 00:00:00 2001 From: Nimit Kalra Date: Sun, 18 Oct 2015 13:44:13 -0500 Subject: [PATCH] Regenerate git-changelog man pages (.html and .1) for #471. --- man/git-changelog.1 | 8 +++++++- man/git-changelog.html | 10 +++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/man/git-changelog.1 b/man/git-changelog.1 index 46a4093..023ad32 100644 --- 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 index 14b39a5..ef6bc11 100644 --- a/man/git-changelog.html +++ b/man/git-changelog.html @@ -65,7 +65,7 @@
  1. git-changelog(1)
    2. -
  2. +
  3. Git Extras
  4. git-changelog(1)
@@ -115,6 +115,10 @@

Filters out merge commits (commits with more than 1 parent) from generated changelog.

+

-m, --merges-only

+ +

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, --prune-old

Replace existing changelog entirely with newly generated content, thereby disabling the default behavior of appending the content of any detected changelog to the end of newly generated content.

@@ -159,7 +163,7 @@

AUTHOR

-

Written by Mark Eissler <mark@mixtur.com>

+

Written by Mark Eissler <mark@mixtur.com>

REPORTING BUGS

@@ -172,7 +176,7 @@
  1. -
  2. April 2015
    3. +
  3. October 2015
  4. git-changelog(1)