[PATCH] doc: attempt to clarify a blurry sentence.

Subsystems: documentation, the rest

STALE1913d

2 messages, 2 authors, 2021-05-07 · open the first message on its own page

[PATCH] doc: attempt to clarify a blurry sentence.

From: Lars Berntzon via GitGitGadget <hidden>
Date: 2021-05-06 16:37:08

From: Lars Berntzon <redacted>

Signed-off-by: Lars Berntzon <redacted>
---
    Attempt to clarify a blurry sentence.
    
    Signed-off-by: Lars Berntzon lars.berntzon@cecilia-data.se

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1019%2Flboclboc%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1019/lboclboc/master-v1
Pull-Request: https://github.com/git/git/pull/1019

 Documentation/git-push.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index a953c7c38790..bbb30c52395e 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -66,10 +66,10 @@ it can be any arbitrary "SHA-1 expression", such as `master~4` or
 The <dst> tells which ref on the remote side is updated with this
 push. Arbitrary expressions cannot be used here, an actual ref must
 be named.
-If `git push [<repository>]` without any `<refspec>` argument is set to
-update some ref at the destination with `<src>` with
-`remote.<repository>.push` configuration variable, `:<dst>` part can
-be omitted--such a push will update a ref that `<src>` normally updates
+If `git push [<repository>]` without any `<refspec>` argument then
+git will update the remote ref as defined by `remote.<repository>.push` configuration
+and it will be updated from HEAD.
+`:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates
 without any `<refspec>` on the command line.  Otherwise, missing
 `:<dst>` means to update the same ref as the `<src>`.
 +
base-commit: 7e391989789db82983665667013a46eabc6fc570
-- 
gitgitgadget

Re: [PATCH] doc: attempt to clarify a blurry sentence.

From: Lars Berntzon <hidden>
Date: 2021-05-07 08:51:47

Yes, your text is clear. I realize now I miss-read the line as if it was:

   If git push [<repository>] without any <refspec> argument is set, to 
-update some ref at the destination with <src> with....

I mentally placed the comma there and then I could not get pass that 
(and for me there was no verb there to start with so I though it was the 
git-doc lingua).

But the main problem I have I guess is that the line refers to and , but 
those comes from the ref-spec, but the whole line is about when ref-spec 
is not specified so the placeholders and are not valid. Also your 
clarification contain <src> and <dst> but again without ref-spec that is 
not defined.

Regards, Lars

On 2021-05-06 18:37, Lars Berntzon via GitGitGadget wrote:
quoted hunk
From: Lars Berntzon <redacted>

Signed-off-by: Lars Berntzon <redacted>
---
     Attempt to clarify a blurry sentence.
     
     Signed-off-by: Lars Berntzon lars.berntzon@cecilia-data.se

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1019%2Flboclboc%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1019/lboclboc/master-v1
Pull-Request: https://github.com/git/git/pull/1019

  Documentation/git-push.txt | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index a953c7c38790..bbb30c52395e 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -66,10 +66,10 @@ it can be any arbitrary "SHA-1 expression", such as `master~4` or
  The <dst> tells which ref on the remote side is updated with this
  push. Arbitrary expressions cannot be used here, an actual ref must
  be named.
-If `git push [<repository>]` without any `<refspec>` argument is set to
-update some ref at the destination with `<src>` with
-`remote.<repository>.push` configuration variable, `:<dst>` part can
-be omitted--such a push will update a ref that `<src>` normally updates
+If `git push [<repository>]` without any `<refspec>` argument then
+git will update the remote ref as defined by `remote.<repository>.push` configuration
+and it will be updated from HEAD.
+`:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates
  without any `<refspec>` on the command line.  Otherwise, missing
  `:<dst>` means to update the same ref as the `<src>`.
  +
base-commit: 7e391989789db82983665667013a46eabc6fc570
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help