From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D69F71F453 for ; Wed, 3 Oct 2018 21:22:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726338AbeJDEMR (ORCPT ); Thu, 4 Oct 2018 00:12:17 -0400 Received: from newman.cs.utexas.edu ([128.83.139.110]:41067 "EHLO newman.cs.utexas.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbeJDEMR (ORCPT ); Thu, 4 Oct 2018 00:12:17 -0400 X-Greylist: delayed 804 seconds by postgrey-1.27 at vger.kernel.org; Thu, 04 Oct 2018 00:12:16 EDT Received: from vyasa.cs.utexas.edu (vyasa.cs.utexas.edu [128.83.130.99]) by newman.cs.utexas.edu (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id w93L8foK021589 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 3 Oct 2018 16:08:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cs.utexas.edu; s=default; t=1538600922; bh=GSTOCDL11TY9T8jVqQaI7BA75fRwwEAESOB9IojKzY4=; h=From:To:Cc:Subject:Date:From; b=L1XQym/UZDJzKDjToBSPysMitmhOvIyISa0r/mxc4plYNuI2D3esO65xZHc/HKnvP SdW51LtllWG5bE8bQtaV5ogbGETr3nejyXZr4CF7kxCsWkCpxOOblKJNc9Lj9353hA hjVVI9kZX9CmxE4GGLT0DC8zRStL/ZQvVgtpbCTg= Received: (from mihir@localhost) by vyasa.cs.utexas.edu (8.15.2/8.15.2/Submit) id w93L8fjn024705; Wed, 3 Oct 2018 16:08:41 -0500 From: Mihir Mehta To: git@vger.kernel.org Cc: gitster@pobox.com, sunshine@sunshineco.us, Mihir Mehta Subject: [PATCH] doc: fix a typo and clarify a sentence Date: Wed, 3 Oct 2018 16:08:24 -0500 Message-Id: <20181003210824.24634-1-mihir@cs.utexas.edu> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.3.9 (newman.cs.utexas.edu [128.83.139.110]); Wed, 03 Oct 2018 16:08:41 -0500 (CDT) X-Virus-Scanned: clamav-milter 0.98.7 at newman X-Virus-Status: Clean Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org I noticed that git-merge-base was unlikely to actually be a git command, and tried it in my shell. Seeing that it doesn't work, I cleaned up two places in the docs where it appears. Signed-off-by: Mihir Mehta --- Documentation/git-diff.txt | 5 +++-- Documentation/howto/update-hook-example.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index b180f1fa5..6173f569e 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -72,8 +72,9 @@ two blob objects, or changes between two files on disk. This form is to view the changes on the branch containing and up to the second , starting at a common ancestor of both . "git diff A\...B" is equivalent to - "git diff $(git-merge-base A B) B". You can omit any one - of , which has the same effect as using HEAD instead. + "git diff $(git merge-base A B) B". You can omit any one + of the two instances of , which has the same effect as + using HEAD in its place. Just in case if you are doing something exotic, it should be noted that all of the in the above description, except diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt index a5193b1e5..89821ec74 100644 --- a/Documentation/howto/update-hook-example.txt +++ b/Documentation/howto/update-hook-example.txt @@ -80,7 +80,7 @@ case "$1" in info "The branch '$1' is new..." else # updating -- make sure it is a fast-forward - mb=$(git-merge-base "$2" "$3") + mb=$(git merge-base "$2" "$3") case "$mb,$2" in "$2,$mb") info "Update is fast-forward" ;; *) noff=y; info "This is not a fast-forward update.";; -- 2.19.0