On Sun, Jun 21, 2015 at 4:48 PM, Karthik Nayak <karthik.188@xxxxxxxxx> wrote:
> Add the '--merged' and '--no-merged' options provided by 'ref-filter'.
> The '--merged' option lets the user to only list refs merged into the
> named commit. The '--no-merged' option lets the user to only list refs
> not merged into the named commit.
>
> Add documentation and tests for the same.
>
> Based-on-patch-by: Jeff King <peff@xxxxxxxx>
> Mentored-by: Christian Couder <christian.couder@xxxxxxxxx>
> Mentored-by: Matthieu Moy <matthieu.moy@xxxxxxxxxxxxxxx>
> Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx>
> ---
> diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
> index 0ede41d..c6dcd99 100644
> --- a/Documentation/git-for-each-ref.txt
> +++ b/Documentation/git-for-each-ref.txt
> @@ -10,7 +10,7 @@ SYNOPSIS
> [verse]
> 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
> [(--sort=<key>)...] [--format=<format>] [<pattern>...]
> - [--points-at <object>]
> + [--points-at <object>] [(--merged | --no-merged) <object>]
According to the documentation you added to the OPTIONS section, the
object following --merged and --no-merged is optional. Therefore,
shouldn't this be s/<object>/[<object>]/ ?
Also, in the OPTIONS section, you spelled it "commit" rather than "object".
> DESCRIPTION
> -----------
> @@ -66,6 +66,14 @@ OPTIONS
> --points-at <object>::
> Only list refs pointing to the given object.
>
> +--merged [<commit>]::
> + Only list refs whose tips are reachable from the
> + specified commit (HEAD if not specified).
> +
> +--no-merged [<commit>]::
> + Only list refs whose tips are not reachable from the
> + specified commit (HEAD if not specified).
> +
> FIELD NAMES
> -----------
>
> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
> index 46f9b05..09d48da 100644
> --- a/builtin/for-each-ref.c
> +++ b/builtin/for-each-ref.c
> @@ -8,6 +8,7 @@
> static char const * const for_each_ref_usage[] = {
> N_("git for-each-ref [<options>] [<pattern>]"),
> N_("git for-each-ref [--points-at <object>]"),
> + N_("git for-each-ref [(--merged | --no-merged) <object>]"),
Ditto: s/<object>/[<object>]/
> NULL
> };
--
To unsubscribe from this list: send the line "unsubscribe git" in