git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/4] merge-base: "--is-ancestor A B"

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 31, 2012, 18:45 UTC
Message-ID
<7v3932oq7z.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CANiSa6i5tY_V_dhK0wSaKzy0xwvN9uTqRJUJ7ZvgqCG7Ta5rsQ@mail.gmail.com>
Martin von Zweigbergk <martinvonz@gmail.com> writes:
Show 15 quoted lines
> On Fri, Aug 31, 2012 at 10:25 AM, Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> I think "merge-base -h" will get this for free thanks to parseopt.
>
> It seems not, or maybe I'm using the wrong terminology; I meant to
> include it in the first part of the below.
>
> usage: git merge-base [-a|--all] <commit> <commit>...
>    or: git merge-base [-a|--all] --octopus <commit>...
>    or: git merge-base --independent <commit>...
>
>     -a, --all             output all common ancestors
>     --octopus             find ancestors for a single n-way merge
>     --independent         list revs not reachable from others
>     --is-ancestor         is the first one ancestor of the other?
Ahh.

As most of the modern parse-optified ones just say "git cmd <args>" or something like that, I wasn't paying attention to the upper part.

Will amend again.  Thanks.
Previous: Martin von ZweigbergkNext: Junio C Hamano
Message 7 of 9 in “"merge-base" updates”
  1. 0/4 "merge-base" updatesJunio C Hamano, Aug 30, 2012
  2. 1/4 merge_bases_many(): split out the logic to paint historyJunio C Hamano, Aug 30, 2012
  3. 2/4 merge-base: "--is-ancestor A B"Junio C Hamano, Aug 30, 2012
  4. Martin von ZweigbergkAug 31, 2012
  5. Junio C HamanoAug 31, 2012
  6. Martin von ZweigbergkAug 31, 2012
  7. Junio C HamanoAug 31, 2012
  8. 3/4 in_merge_bases(): use paint_down_to_common()Junio C Hamano, Aug 30, 2012
  9. 4/4 get_merge_bases_many(): walk from many tips in parallelJunio C Hamano, Aug 30, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.