From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH v2 00/10] More consistant terminology ("remote-tracking branch", "not updated") Date: Mon, 25 Oct 2010 08:08:32 +0200 Message-ID: <1287986922-16308-1-git-send-email-Matthieu.Moy@imag.fr> References: <1287851481-27952-1-git-send-email-Matthieu.Moy@imag.fr> Cc: Thore Husfeldt , Jonathan Nieder , Jakub Narebski , Matthieu Moy To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Mon Oct 25 08:12:55 2010 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 1PAGIg-00050W-Hp for gcvg-git-2@lo.gmane.org; Mon, 25 Oct 2010 08:12:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752822Ab0JYGMt (ORCPT ); Mon, 25 Oct 2010 02:12:49 -0400 Received: from imag.imag.fr ([129.88.30.1]:43894 "EHLO imag.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752142Ab0JYGMt (ORCPT ); Mon, 25 Oct 2010 02:12:49 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by imag.imag.fr (8.13.8/8.13.8) with ESMTP id o9P68j3L012303 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 25 Oct 2010 08:08:45 +0200 (CEST) Received: from bauges.imag.fr ([129.88.43.5]) by mail-veri.imag.fr with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PAGEf-00050G-6o; Mon, 25 Oct 2010 08:08:45 +0200 Received: from moy by bauges.imag.fr with local (Exim 4.69) (envelope-from ) id 1PAGEf-0004Fj-2b; Mon, 25 Oct 2010 08:08:45 +0200 X-Mailer: git-send-email 1.7.3.2.183.g2e7b0 In-Reply-To: <1287851481-27952-1-git-send-email-Matthieu.Moy@imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (imag.imag.fr [129.88.30.1]); Mon, 25 Oct 2010 08:08:45 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Here's a new version that should address Jonathan's remarks. I've reworded a bit the user-manual.txt changes, they may adress Thore's remark, but we can probably do better. But no time for that now ;-). Matthieu Moy (10): Better "Changed but not updated" message in git-status Replace "remote tracking" with "remote-tracking" Change remote tracking to remote-tracking in non-trivial places Change "tracking branch" to "remote-tracking branch" Change "tracking branch" to "remote-tracking branch" in C code Change incorrect uses of "remote branch" meaning "remote-tracking" Change incorrect "remote branch" to "remote tracking branch" in C code Use 'remote-tracking branch' in generated merge messages user-manual.txt: explain better the remote(-tracking) branch terms git-branch.txt: mention --set-upstream as a way to change upstream configuration Documentation/config.txt | 13 ++++++----- Documentation/everyday.txt | 6 ++-- Documentation/fetch-options.txt | 2 +- Documentation/git-branch.txt | 14 +++++++----- Documentation/git-checkout.txt | 2 +- Documentation/git-clone.txt | 2 +- Documentation/git-describe.txt | 2 +- Documentation/git-fetch.txt | 2 +- Documentation/git-gc.txt | 6 ++-- Documentation/git-log.txt | 2 +- Documentation/git-pull.txt | 8 +++--- Documentation/git-remote.txt | 6 ++-- Documentation/git-tag.txt | 4 +- Documentation/gittutorial-2.txt | 2 +- Documentation/gittutorial.txt | 6 ++-- Documentation/glossary-content.txt | 8 +++--- Documentation/rev-list-options.txt | 2 +- Documentation/user-manual.txt | 30 ++++++++++++++++++++------- branch.h | 2 +- builtin/checkout.c | 4 +- builtin/fetch.c | 6 ++-- builtin/fmt-merge-msg.c | 6 ++-- builtin/merge.c | 2 +- builtin/remote.c | 6 ++-- contrib/examples/builtin-fetch--tool.c | 2 +- remote.c | 2 +- t/t1507-rev-parse-upstream.sh | 2 +- t/t3409-rebase-preserve-merges.sh | 2 +- t/t5400-send-pack.sh | 2 +- t/t5505-remote.sh | 8 ++++-- t/t5513-fetch-track.sh | 2 +- t/t7508-status.sh | 34 ++++++++++++++++---------------- t/t7608-merge-messages.sh | 4 +- wt-status.c | 2 +- 34 files changed, 111 insertions(+), 92 deletions(-) -- 1.7.3.2.183.g2e7b0