Skip to contentSkip to conversation

doc: fixups for ab/fetch-tags-noclobber

PATCH In review Ævar Arnfjörð Bjarmason 3 participants 6 messages Sep 18, 2018 – Sep 20, 2018 Documentation

lore
Share & tools
lore
#0 lore raw

cover doc: fixups for ab/fetch-tags-noclobber

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(-)
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a
#1 lore raw

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

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

---
 Documentation/git-push.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/git-push.txt +1 -1
index f345bd30fc..a5fc54aeab 100644
@@ -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
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a
#2 lore raw

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

In reply to Æ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.

---
 Documentation/pull-fetch-param.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/pull-fetch-param.txt +1 -1
index 293c6b967d..2b1fbe03aa 100644
@@ -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
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a
#3 lore raw

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

In reply to Æ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).

---
 Documentation/pull-fetch-param.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/pull-fetch-param.txt +1 -1
index 2b1fbe03aa..7d3a60f5b9 100644
@@ -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`).
 +
Signature · 1 line
2.19.0.rc2.392.g5ba43deb5a
#4 lore raw

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

Quoted 2 lines · Æ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

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

Quoted 4 lines

0bc8d71b99 ("fetch: stop clobbering existing tags without --force", 2018-08-31).

#5 lore raw

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

Quoted 7 lines · Eric Sunshine
Quoted 2 lines · Æ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

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.