From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Thore Husfeldt <thore.husfeldt@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH 00/11] More consistant terminology ("remote-tracking branch", "not updated")
Date: Sat, 23 Oct 2010 18:31:11 +0200 [thread overview]
Message-ID: <1287851481-27952-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
Following the discussion in
http://thread.gmane.org/gmane.comp.version-control.git/159287/
http://thread.gmane.org/gmane.comp.version-control.git/159287/focus=159288
this is an attempt to be more consistant in the terminology used in Git.
The first patch fixes git status's "changed but not updated", and the
rest tries to use "remote-tracking branch" consistantly. This
essentially changes the doc, and also does slight modifications to the
code. This changes error message, and maybe more controversially the
generated merge messages (in a separate patch in case this is too
controversial).
I've tried splitting this into systematic changes to ease review, but
patches should be applicable in any order (i.e. Junio: if you find
some of the patches good and uncontroversial, you can pick them
right away).
Patch "user-manual.txt: explain better the remote(-tracking) branch
terms" comes last, and adds a few sentences to make the distinction
between remote, remote branch, remote-tracking branches explicit.
Hopefully, this should avoid future users to have the same
difficulties as Thore ;-).
The last 2 patches are minor things I noticed while going through the
docs, but are essentially unrelated.
I'll be busy next week, so if anyone else wants to pick this patch
serie and update it according to list review, he's welcome. Otherwise,
it may have to wait.
Matthieu Moy (11):
Better "Changed but not updated" message in git-status
Remplace "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
git-http-push.txt: fix typo (branch -> branches)
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-http-push.txt | 2 +-
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 | 22 +++++++++++++++-----
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 | 6 ++--
t/t5513-fetch-track.sh | 2 +-
t/t7508-status.sh | 34 ++++++++++++++++----------------
t/t7608-merge-messages.sh | 4 +-
wt-status.c | 2 +-
35 files changed, 104 insertions(+), 91 deletions(-)
--
1.7.3.2.537.g7e355
next reply other threads:[~2010-10-23 16:33 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-23 16:31 Matthieu Moy [this message]
2010-10-23 16:31 ` [PATCH 01/10] Better "Changed but not updated" message in git-status Matthieu Moy
2010-10-23 18:13 ` Jonathan Nieder
2010-10-23 18:33 ` Matthieu Moy
2010-10-23 18:55 ` Jakub Narebski
2010-10-23 16:31 ` [PATCH 02/10] Remplace "remote tracking" with "remote-tracking" Matthieu Moy
2010-10-23 18:16 ` Jonathan Nieder
2010-10-23 18:31 ` Jonathan Nieder
2010-10-23 19:01 ` Matthieu Moy
2010-10-23 16:31 ` [PATCH 03/10] Change remote tracking to remote-tracking in non-trivial places Matthieu Moy
2010-10-23 18:44 ` Jonathan Nieder
2010-10-23 19:04 ` Matthieu Moy
2010-10-23 16:31 ` [PATCH 04/10] Change "tracking branch" to "remote-tracking branch" Matthieu Moy
2010-10-23 18:48 ` Jonathan Nieder
2010-10-28 1:55 ` Matthieu Moy
2010-10-23 16:31 ` [PATCH 05/10] Change "tracking branch" to "remote-tracking branch" in C code Matthieu Moy
2010-10-23 18:51 ` Jonathan Nieder
2010-10-26 22:15 ` Matthieu Moy
2010-10-23 16:31 ` [PATCH 06/10] Change incorrect uses of "remote branch" meaning "remote-tracking" Matthieu Moy
2010-10-23 16:31 ` [PATCH 07/10] Change incorrect "remote branch" to "remote tracking branch" in C code Matthieu Moy
2010-10-23 18:58 ` Jonathan Nieder
2010-10-23 19:19 ` Matthieu Moy
2010-10-23 16:31 ` [PATCH 08/10] Use 'remote-tracking branch' in generated merge messages Matthieu Moy
2010-10-23 19:04 ` Jonathan Nieder
2010-10-23 19:53 ` Matthieu Moy
2010-10-23 16:31 ` [PATCH 09/10] user-manual.txt: explain better the remote(-tracking) branch terms Matthieu Moy
2010-10-23 19:08 ` Jonathan Nieder
2010-10-23 19:34 ` Matthieu Moy
2010-10-24 14:47 ` Thore Husfeldt
2010-10-24 15:18 ` Jonathan Nieder
2010-10-24 23:32 ` Jakub Narebski
2010-10-26 3:11 ` Matthieu Moy
2010-10-26 4:16 ` Miles Bader
2010-10-23 16:31 ` [PATCH 10/10] git-branch.txt: mention --set-upstream as a way to change upstream configuration Matthieu Moy
2010-10-23 18:55 ` [PATCH 00/11] More consistant terminology ("remote-tracking branch", "not updated") Jakub Narebski
2010-10-23 19:11 ` Jonathan Nieder
2010-10-25 17:30 ` Matthieu Moy
2010-10-25 6:08 ` [PATCH v2 00/10] " Matthieu Moy
2010-10-25 6:08 ` [PATCH 01/10] Better "Changed but not updated" message in git-status Matthieu Moy
2010-10-25 6:08 ` [PATCH 02/10] Replace "remote tracking" with "remote-tracking" Matthieu Moy
2010-10-25 6:08 ` [PATCH 03/10] Change remote tracking to remote-tracking in non-trivial places Matthieu Moy
2010-10-25 6:08 ` [PATCH 04/10] Change "tracking branch" to "remote-tracking branch" Matthieu Moy
2010-10-25 6:08 ` [PATCH 05/10] Change "tracking branch" to "remote-tracking branch" in C code Matthieu Moy
2010-10-25 6:08 ` [PATCH 06/10] Change incorrect uses of "remote branch" meaning "remote-tracking" Matthieu Moy
2010-10-25 6:08 ` [PATCH 07/10] Change incorrect "remote branch" to "remote tracking branch" in C code Matthieu Moy
2010-10-25 6:08 ` [PATCH 08/10] Use 'remote-tracking branch' in generated merge messages Matthieu Moy
2010-10-25 6:08 ` [PATCH 09/10] user-manual.txt: explain better the remote(-tracking) branch terms Matthieu Moy
2010-10-26 6:07 ` Jay Soffian
2010-10-26 22:13 ` Matthieu Moy
2010-10-26 6:20 ` Jay Soffian
2010-10-27 0:01 ` Matthieu Moy
2010-10-27 0:06 ` [PATCH] " Matthieu Moy
2010-10-25 6:08 ` [PATCH 10/10] git-branch.txt: mention --set-upstream as a way to change upstream configuration Matthieu Moy
2010-10-25 17:52 ` [PATCH 00/11] More consistant terminology ("remote-tracking branch", "not updated") Drew Northup
2010-10-28 18:21 ` [PATCH 00/10 v3] " Matthieu Moy
2010-10-28 18:21 ` [PATCH 01/10] Better "Changed but not updated" message in git-status Matthieu Moy
2010-10-28 18:35 ` Jonathan Nieder
2010-10-28 21:46 ` Junio C Hamano
2010-10-28 22:09 ` Jonathan Nieder
2010-10-28 22:47 ` Matthieu Moy
2010-10-28 23:20 ` Junio C Hamano
2010-10-28 23:39 ` Matthieu Moy
2010-10-29 21:06 ` Drew Northup
2010-10-30 4:00 ` Matthieu Moy
2010-10-28 18:21 ` [PATCH 02/10] Replace "remote tracking" with "remote-tracking" Matthieu Moy
2010-10-28 19:52 ` Jonathan Nieder
2010-10-28 18:21 ` [PATCH 03/10] Change remote tracking to remote-tracking in non-trivial places Matthieu Moy
2010-10-28 18:39 ` Jonathan Nieder
2010-10-28 21:50 ` Matthieu Moy
2010-10-28 22:13 ` Jonathan Nieder
2010-10-28 22:40 ` Matthieu Moy
2010-10-29 17:26 ` Drew Northup
2010-10-28 18:21 ` [PATCH 04/10] Change "tracking branch" to "remote-tracking branch" Matthieu Moy
2010-10-28 19:56 ` Jonathan Nieder
2010-10-28 18:21 ` [PATCH 05/10] Change incorrect uses of "remote branch" meaning "remote-tracking" Matthieu Moy
2010-10-28 18:21 ` [PATCH 06/10] Change incorrect "remote branch" to "remote tracking branch" in C code Matthieu Moy
2010-10-28 19:13 ` Jonathan Nieder
2010-10-28 22:34 ` Matthieu Moy
2010-10-28 23:23 ` Jonathan Nieder
2010-10-28 18:21 ` [PATCH 07/10] Use 'remote-tracking branch' in generated merge messages Matthieu Moy
2010-10-28 18:21 ` [PATCH 08/10] user-manual.txt: explain better the remote(-tracking) branch terms Matthieu Moy
2010-10-28 19:42 ` Jonathan Nieder
2010-10-28 23:40 ` Matthieu Moy
2010-10-28 18:21 ` [PATCH 09/10] user-manual: remote-tracking can be checked out, with detached HEAD Matthieu Moy
2010-10-28 18:21 ` [PATCH 10/10] git-branch.txt: mention --set-upstream as a way to change upstream configuration Matthieu Moy
2010-10-28 20:08 ` Jonathan Nieder
2010-10-30 4:10 ` [PATCH 00/11 v4] More consistant terminology Matthieu Moy
2010-10-30 6:58 ` Jonathan Nieder
2010-10-30 4:10 ` [PATCH 01/11] Better "Changed but not updated" message in git-status Matthieu Moy
2010-10-30 4:10 ` [PATCH 02/11] Replace "remote tracking" with "remote-tracking" Matthieu Moy
2010-10-30 4:10 ` [PATCH 03/11] Change remote tracking to remote-tracking in non-trivial places Matthieu Moy
2010-10-30 4:10 ` [PATCH 04/11] everyday.txt: change "tracking branch" to "remote-tracking branch" Matthieu Moy
2010-10-30 4:10 ` [PATCH 05/11] Change " Matthieu Moy
2010-10-30 4:10 ` [PATCH 06/11] Change incorrect uses of "remote branch" meaning "remote-tracking" Matthieu Moy
2010-10-30 4:10 ` [PATCH 07/11] Change incorrect "remote branch" to "remote tracking branch" in C code Matthieu Moy
2010-10-30 4:10 ` [PATCH 08/11] Use 'remote-tracking branch' in generated merge messages Matthieu Moy
2010-10-30 4:10 ` [PATCH 09/11] user-manual.txt: explain better the remote(-tracking) branch terms Matthieu Moy
2010-10-30 7:18 ` Jonathan Nieder
2010-10-31 14:57 ` Matthieu Moy
2010-10-30 4:10 ` [PATCH 10/11] user-manual: remote-tracking can be checked out, with detached HEAD Matthieu Moy
2010-10-30 4:10 ` [PATCH 11/11] git-branch.txt: mention --set-upstream as a way to change upstream configuration Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287851481-27952-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=thore.husfeldt@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).