From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent van Ravesteijn Subject: [PATCH/resend] Documentation: update to git-merge-base --octopus Date: Tue, 12 Apr 2011 18:14:05 +0200 Message-ID: <4DA47A4D.80909@lyx.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Jonathan Nieder To: Git Mailing List X-From: git-owner@vger.kernel.org Tue Apr 12 18:14:29 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Q9gEX-000592-2A for gcvg-git-2@lo.gmane.org; Tue, 12 Apr 2011 18:14:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758111Ab1DLQOU (ORCPT ); Tue, 12 Apr 2011 12:14:20 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:58033 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758079Ab1DLQOT (ORCPT ); Tue, 12 Apr 2011 12:14:19 -0400 Received: by ewy4 with SMTP id 4so2074402ewy.19 for ; Tue, 12 Apr 2011 09:14:18 -0700 (PDT) Received: by 10.14.17.75 with SMTP id i51mr2721282eei.107.1302624857810; Tue, 12 Apr 2011 09:14:17 -0700 (PDT) Received: from [145.94.80.223] (x080223.tnw-m.tudelft.nl [145.94.80.223]) by mx.google.com with ESMTPS id u1sm3880735eeh.13.2011.04.12.09.14.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Apr 2011 09:14:16 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 1) Make it clear that when the --octopus parameter is given to 'git merge-base', only a set of commits is expected as the parameter. On the other hand, in the case without the --octopus parameter, it is necessary to supply a single commit and a set. Moreover, in the case of --octopus merging, a single commit is also valid, which is not the case otherwise. 2) Add a sentence to the discussion that when --octopus is used, we do expect '2' as the result. Signed-off-by: Vincent van Ravesteijn --- Sorry for the noise caused by the previous attempt(s). Apparently my attempts to let Thunderbird _not wrap_ the lines were counterproductive. Here is the patch again. Documentation/git-merge-base.txt | 6 +++++- builtin/merge-base.c | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index eedef1b..1bac04f 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -9,7 +9,8 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- [verse] -'git merge-base' [-a|--all] [--octopus] ... +'git merge-base' [-a|--all] ... +'git merge-base' [-a|--all] --octopus ... 'git merge-base' --independent ... DESCRIPTION @@ -89,6 +90,9 @@ and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base. +When the option `--octopus` is given, the result of `git merge-base A B C` +will be '2', because '2' is the common ancestor of all branches. + When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology: diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 96dd160..4f30f1b 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -23,7 +23,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all) } static const char * const merge_base_usage[] = { - "git merge-base [-a|--all] [--octopus] ...", + "git merge-base [-a|--all] ...", + "git merge-base [-a|--all] --octopus ...", "git merge-base --independent ...", NULL }; -- 1.7.3.1.msysgit.0