[PATCH 0/3] doc: fixups for ab/fetch-tags-noclobber

[PATCH 0/3] doc: fixups for ab/fetch-tags-noclobber

[Ævar Arnfjörð Bjarmason]

Of course I only noticed these after the series had landed in
master...

Ævar Arnfjörð Bjarmason (3):
  push doc: add spacing between two words
  fetch doc: correct grammar in --force docs
  fetch doc: correct grammar in --force docs

 Documentation/git-push.txt         | 2 +-
 Documentation/pull-fetch-param.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.19.0.rc2.392.g5ba43deb5a

[PATCH 1/3] push doc: add spacing between two words

[Ævar Arnfjörð Bjarmason]

Fix a formatting error introduced in my recently landed
fe802bd21e ("push doc: correct lies about how push refspecs work",
2018-08-31).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 Documentation/git-push.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index f345bd30fc..a5fc54aeab 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -110,7 +110,7 @@ can be overridden by adding an the optional leading `+` to a refspec
 is that no amount of forcing will make the `refs/heads/*` namespace
 accept a non-commit object. Hooks and configuration can also override
 or amend these rules, see e.g. `receive.denyNonFastForwards` in
-linkgit:git-config[1] and`pre-receive` and `update` in
+linkgit:git-config[1] and `pre-receive` and `update` in
 linkgit:githooks[5].
 +
 Pushing an empty <src> allows you to delete the <dst> ref from the
-- 
2.19.0.rc2.392.g5ba43deb5a

[PATCH 2/3] fetch doc: correct grammar in --force docs

[Ævar Arnfjörð Bjarmason]

Correct a grammar error (saying "the receiving" made no sense) in the
recently landed documentation added in my 0bc8d71b99 ("fetch: stop
clobbering existing tags without --force", 2018-08-31) by rephrasing
the sentence.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 Documentation/pull-fetch-param.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 293c6b967d..2b1fbe03aa 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -45,7 +45,7 @@ rules particular to 'git fetch' are noted below.
 +
 Until Git version 2.20, and unlike when pushing with
 linkgit:git-push[1], any updates to `refs/tags/*` would be accepted
-without `+` in the refspec (or `--force`). The receiving promiscuously
+without `+` in the refspec (or `--force`). When fetching, we promiscuously
 considered all tag updates from a remote to be forced fetches.  Since
 Git version 2.20, fetching to update `refs/tags/*` work the same way
 as when pushing. I.e. any updates will be rejected without `+` in the
-- 
2.19.0.rc2.392.g5ba43deb5a

[PATCH 3/3] fetch doc: correct grammar in --force docs

[Ævar Arnfjörð Bjarmason]

"Work the same" is incorrect and needs to be "Works the same
way". Fixes grammar in document anion I added in the recently landed
0bc8d71b99 ("fetch: stop clobbering existing tags without --force",
2018-08-31).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 Documentation/pull-fetch-param.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 2b1fbe03aa..7d3a60f5b9 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -47,7 +47,7 @@ Until Git version 2.20, and unlike when pushing with
 linkgit:git-push[1], any updates to `refs/tags/*` would be accepted
 without `+` in the refspec (or `--force`). When fetching, we promiscuously
 considered all tag updates from a remote to be forced fetches.  Since
-Git version 2.20, fetching to update `refs/tags/*` work the same way
+Git version 2.20, fetching to update `refs/tags/*` works the same way
 as when pushing. I.e. any updates will be rejected without `+` in the
 refspec (or `--force`).
 +
-- 
2.19.0.rc2.392.g5ba43deb5a

Re: [PATCH 3/3] fetch doc: correct grammar in --force docs

[Eric Sunshine]

On Tue, Sep 18, 2018 at 1:48 AM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> "Work the same" is incorrect and needs to be "Works the same
> way". Fixes grammar in document anion I added in the recently landed

I, too, find those "document anions" problematic. Perhaps the
physicists around here can do something about it.

> 0bc8d71b99 ("fetch: stop clobbering existing tags without --force",
> 2018-08-31).
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Re: [PATCH 3/3] fetch doc: correct grammar in --force docs

[Junio C Hamano]

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Tue, Sep 18, 2018 at 1:48 AM Ævar Arnfjörð Bjarmason
> <avarab@gmail.com> wrote:
>> "Work the same" is incorrect and needs to be "Works the same
>> way". Fixes grammar in document anion I added in the recently landed
>
> I, too, find those "document anions" problematic. Perhaps the
> physicists around here can do something about it.

Well, let's squash 2+3 together then.