From e777095a9f0dc673f5dd55a454555455d10fa1be Mon Sep 17 00:00:00 2001 From: Damian Krzeminski Date: Wed, 16 Jan 2013 20:36:12 -0800 Subject: [PATCH] Update git-changelog docs for --no-merges option --- man/git-changelog.1 | 14 ++++++++++---- man/git-changelog.html | 12 ++++++++---- man/git-changelog.md | 4 ++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/man/git-changelog.1 b/man/git-changelog.1 index 57f760c..f576e40 100644 --- a/man/git-changelog.1 +++ b/man/git-changelog.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 -.\" https://github.com/rtomayko/ronn/tree/0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "GIT\-CHANGELOG" "1" "July 2012" "" "" +.TH "GIT\-CHANGELOG" "1" "December 2013" "" "Git Extras" . .SH "NAME" \fBgit\-changelog\fR \- Generate the changelog report @@ -18,6 +18,12 @@ Populates the file named matching \fIchange|history \-i\fR with the commits sinc .P Show commit logs from the current version\. . +.P +\-\-no\-merges +. +.P +Filters out merge commits (commits with more than 1 parent) from generated changelog\. +. .SH "EXAMPLES" . .IP "\(bu" 4 @@ -71,7 +77,7 @@ Initial commit Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR> . .SH "REPORTING BUGS" -<\fIhttp://github\.com/visionmedia/git\-extras/issues\fR> +<\fIhttps://github\.com/visionmedia/git\-extras/issues\fR> . .SH "SEE ALSO" -<\fIhttp://github\.com/visionmedia/git\-extras\fR> +<\fIhttps://github\.com/visionmedia/git\-extras\fR> diff --git a/man/git-changelog.html b/man/git-changelog.html index bdba0bf..84beae4 100644 --- a/man/git-changelog.html +++ b/man/git-changelog.html @@ -2,7 +2,7 @@ - + git-changelog(1) - Generate the changelog report