From: Richard Hansen <rhansen@bbn.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Richard Hansen <rhansen@bbn.com>
Subject: [PATCH v3 0/7] documentation cleanups for <rev>^{<type>}
Date: Wed, 4 Sep 2013 15:04:27 -0400 [thread overview]
Message-ID: <1378321474-7125-1-git-send-email-rhansen@bbn.com> (raw)
In-Reply-To: <xmqq1u55plqe.fsf@gitster.dls.corp.google.com>
On 2013-09-03 18:46, Junio C Hamano wrote:
> I hate to say this after seeing you doing a thorough job in this
> series, but because "tree-ish" and "commit-ish" are both made-up
> words, I have a feeling that we are better off unifying to the
> dashed form, which unfortunately is the other way around from what
> your series does.
I thought you might say that so I held on to the commits that
standardize on tree-ish and commit-ish in my local repo. :)
This series still says "tree-ish (also treeish)" and "commit-ish (also
committish)" in gitglossary(7). Would you like me to eliminate the
"(also ...)" part?
I'm not 100% confident that these don't break translations, although
it still builds and "make test" passes.
Changes since v2:
* standardize on 'tree-ish' instead of 'treeish'
* standardize on 'commit-ish' instead of 'committish'
Richard Hansen (7):
glossary: mention 'treeish' as an alternative to 'tree-ish'
glossary: define commit-ish (a.k.a. committish)
use 'tree-ish' instead of 'treeish'
use 'commit-ish' instead of 'committish'
glossary: more precise definition of tree-ish (a.k.a. treeish)
revisions.txt: fix and clarify <rev>^{<type>}
glossary: fix and clarify the definition of 'ref'
Documentation/RelNotes/1.7.11.2.txt | 2 +-
Documentation/config.txt | 4 +--
Documentation/git-cat-file.txt | 2 +-
Documentation/git-describe.txt | 14 ++++-----
Documentation/git-fast-import.txt | 26 +++++++--------
Documentation/git-merge-tree.txt | 2 +-
Documentation/git-name-rev.txt | 2 +-
Documentation/git-push.txt | 2 +-
Documentation/gitcli.txt | 2 +-
Documentation/glossary-content.txt | 47 +++++++++++++++++++++++-----
Documentation/howto/revert-branch-rebase.txt | 2 +-
Documentation/revisions.txt | 12 ++++---
builtin/describe.c | 4 +--
builtin/merge.c | 2 +-
contrib/examples/git-merge.sh | 2 +-
fast-import.c | 20 ++++++------
git-cvsserver.perl | 2 +-
po/da.po | 2 +-
po/de.po | 6 ++--
po/fr.po | 4 +--
po/git.pot | 4 +--
po/it.po | 2 +-
po/nl.po | 2 +-
po/pt_PT.po | 2 +-
po/sv.po | 6 ++--
po/vi.po | 6 ++--
po/zh_CN.po | 4 +--
sha1_name.c | 6 ++--
t/t9300-fast-import.sh | 6 ++--
test-match-trees.c | 4 +--
30 files changed, 118 insertions(+), 83 deletions(-)
--
1.8.4
next prev parent reply other threads:[~2013-09-04 19:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 5:34 [PATCH v2 0/7] documentation cleanups for <rev>^{<type>} Richard Hansen
2013-09-02 5:34 ` [PATCH v2 1/7] glossary: mention 'treeish' as an alternative to 'tree-ish' Richard Hansen
2013-09-03 22:46 ` Junio C Hamano
2013-09-04 19:04 ` Richard Hansen [this message]
2013-09-04 19:04 ` [PATCH v3 " Richard Hansen
2013-09-04 19:04 ` [PATCH v3 2/7] glossary: define commit-ish (a.k.a. committish) Richard Hansen
2013-09-04 19:04 ` [PATCH v3 3/7] use 'tree-ish' instead of 'treeish' Richard Hansen
2013-09-04 19:04 ` [PATCH v3 4/7] use 'commit-ish' instead of 'committish' Richard Hansen
2013-09-04 19:04 ` [PATCH v3 5/7] glossary: more precise definition of tree-ish (a.k.a. treeish) Richard Hansen
2013-09-04 19:04 ` [PATCH v3 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen
2013-09-04 19:04 ` [PATCH v3 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen
2013-09-04 22:27 ` [PATCH v3 0/7] documentation cleanups for <rev>^{<type>} Junio C Hamano
2013-09-02 5:34 ` [PATCH v2 2/7] glossary: define committish (a.k.a. commit-ish) Richard Hansen
2013-09-02 5:34 ` [PATCH v2 3/7] use 'treeish' instead of 'tree-ish' Richard Hansen
2013-09-02 5:34 ` [PATCH v2 4/7] use 'committish' instead of 'commit-ish' Richard Hansen
2013-09-02 5:34 ` [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish) Richard Hansen
2013-09-02 5:34 ` [PATCH v2 6/7] revisions.txt: fix and clarify <rev>^{<type>} Richard Hansen
2013-09-02 5:34 ` [PATCH v2 7/7] glossary: fix and clarify the definition of 'ref' Richard Hansen
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=1378321474-7125-1-git-send-email-rhansen@bbn.com \
--to=rhansen@bbn.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).