threads / patch / 59004

patchdoc/git-branch: fix --force description typo

Subject: [PATCH] doc/git-branch: fix --force description typo

## tl;dr

2 messages between Dec 26, 2022 and Dec 27, 2022. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Kyle Meyer· Dec 26, 2022, 16:54 UTC · lore

Update the description of --force to use '<start-point>' rather than '<startpoint>' to match the spelling used everywhere else in the git-branch documentation.

Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
 Documentation/git-branch.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-branch.txt +1 −1
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 12c5f84e3b..aa2f78c4c2 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -116,7 +116,7 @@ OPTIONS
 
 -f::
 --force::
-	Reset <branchname> to <startpoint>, even if <branchname> exists
+	Reset <branchname> to <start-point>, even if <branchname> exists
 	already. Without `-f`, 'git branch' refuses to change an existing branch.
 	In combination with `-d` (or `--delete`), allow deleting the
 	branch irrespective of its merged status, or whether it even
-- 
2.38.1
Junio C Hamano· Dec 27, 2022, 04:46 UTC · re: Kyle Meyer · lore

Re: [PATCH] doc/git-branch: fix --force description typo

Kyle Meyer <kyle@kyleam.com> writes:
> Subject: Re: [PATCH] doc/git-branch: fix --force description typo
> Update the description of --force to use '<start-point>' rather than
> '<startpoint>' to match the spelling used everywhere else in the
> git-branch documentation.

Thanks. This <startpoint> was written in 2017, and all other lines that say "start-point", except for one, blame on commits made in 2019-2022, but they have been inherited from older versions.

Apparently we missed to convert this single one for consistency.
Good find.  Will queue.  Thanks.
Show 18 quoted lines
> Signed-off-by: Kyle Meyer <kyle@kyleam.com>
> ---
>  Documentation/git-branch.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> index 12c5f84e3b..aa2f78c4c2 100644
> --- a/Documentation/git-branch.txt
> +++ b/Documentation/git-branch.txt
> @@ -116,7 +116,7 @@ OPTIONS
>  
>  -f::
>  --force::
> -	Reset <branchname> to <startpoint>, even if <branchname> exists
> +	Reset <branchname> to <start-point>, even if <branchname> exists
>  	already. Without `-f`, 'git branch' refuses to change an existing branch.
>  	In combination with `-d` (or `--delete`), allow deleting the
>  	branch irrespective of its merged status, or whether it even

← back to recent threads