From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH 00/10 v4] More consistant terminology Date: Tue, 2 Nov 2010 16:31:18 +0100 Message-ID: <1288711888-21528-1-git-send-email-Matthieu.Moy@imag.fr> Cc: Matthieu Moy To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Tue Nov 02 16:38:05 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 1PDIvk-000774-0j for gcvg-git-2@lo.gmane.org; Tue, 02 Nov 2010 16:37:48 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753802Ab0KBPhl (ORCPT ); Tue, 2 Nov 2010 11:37:41 -0400 Received: from mx1.imag.fr ([129.88.30.5]:53143 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883Ab0KBPhk (ORCPT ); Tue, 2 Nov 2010 11:37:40 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id oA2FGbVL006309 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Tue, 2 Nov 2010 16:16:37 +0100 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 1PDIpk-00024n-K8; Tue, 02 Nov 2010 16:31:36 +0100 Received: from moy by bauges.imag.fr with local (Exim 4.69) (envelope-from ) id 1PDIpk-0005bz-Gc; Tue, 02 Nov 2010 16:31:36 +0100 X-Mailer: git-send-email 1.7.3.2.183.g2e7b0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Tue, 02 Nov 2010 16:16:37 +0100 (CET) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: oA2FGbVL006309 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr MailScanner-NULL-Check: 1289315799.06298@rGP+pieV0rYpsHWN/pnA5Q Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The last batch adressed all comments but two: one mis-rebase which ended up in patch hunks in the wrong commit, and separate patches changing remote to remote-tracking in the code, which are now merged. Jonathan Nieder (1): user-manual: remote-tracking can be checked out, with detached HEAD Matthieu Moy (9): 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 everyday.txt: change "tracking branch" to "remote-tracking branch" Change "tracking branch" to "remote-tracking branch" Change incorrect uses of "remote branch" meaning "remote-tracking" Change incorrect "remote branch" to "remote tracking branch" in C code 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 | 20 ++++++++-------- Documentation/rev-list-options.txt | 2 +- Documentation/user-manual.txt | 39 +++++++++++++++++++++++--------- branch.h | 4 +- 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, 124 insertions(+), 102 deletions(-) -- 1.7.3.2.183.g2e7b0