On Mon, Apr 13, 2015 at 11:29 AM, Koosha Khajehmoogahi <koo...@posteo.de> wrote:
> From: Junio C Hamano <gits...@pobox.com>
>
> [kk: added documentation in git-log.txt]
>
> Signed-off-by: Koosha Khajehmoogahi <koo...@posteo.de>
> ---
> diff --git a/Documentation/rev-list-options.txt
> b/Documentation/rev-list-options.txt
> index f620ee4..88f152f 100644
> --- a/Documentation/rev-list-options.txt
> +++ b/Documentation/rev-list-options.txt
> @@ -96,6 +96,23 @@ if it is part of the log message.
> --remove-empty::
> Stop when a given path disappears from the tree.
>
> +--merges={show|hide|only}::
> +
> + Limit the output by type of commits.
> +
> + `hide`;;
> + Hide merge commits from the output.
> +
> + `only`;;
> + Hide non-merge commits from the output (i.e showing
> + only merge commits).
> +
> + `show`;;
> + Do not hide either merge or non-merge commits. This
> + is primarily useful when the user has non-standard
> + setting of `log.merges` configuration variable that
> + needs to be overriden from the command line.
s/overriden/overridden/
> --merges::
> Print only merge commits. This is exactly the same as
> `--min-parents=2`.
>
> --
> 2.3.3.263.g095251d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
