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>,
Jakub Narebski <jnareb@gmail.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH 00/10 v3] More consistant terminology ("remote-tracking branch", "not updated")
Date: Thu, 28 Oct 2010 20:21:47 +0200 [thread overview]
Message-ID: <1288290117-6734-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1287851481-27952-1-git-send-email-Matthieu.Moy@imag.fr>
So, here's a v3 for the patch serie. Nothing very new, just minor
improvements (reword the user-manual change, keep the alphabetical
order in gitglossary, ...)
I think it's ready to cook in pu.
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
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
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 | 20 ++++++++--------
Documentation/rev-list-options.txt | 2 +-
Documentation/user-manual.txt | 40 +++++++++++++++++++++++--------
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, 124 insertions(+), 101 deletions(-)
--
1.7.3.2.183.g2e7b0
next prev parent reply other threads:[~2010-10-28 18:22 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-23 16:31 [PATCH 00/11] More consistant terminology ("remote-tracking branch", "not updated") Matthieu Moy
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 ` Matthieu Moy [this message]
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=1288290117-6734-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.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).