aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-show-branch.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:14 +0000
committerJunio C Hamano <gitster@pobox.com>2023-10-09 12:06:29 -0700
commit6cc668c0abd65415a461c6dddfefffaaeb1d5adc (patch)
tree3c50d80fbb4209594f0779be95899d7ba251cb82 /Documentation/git-show-branch.txt
parent401a4e257e6be731f7dd230b399800a1d79415d0 (diff)
downloadgit-6cc668c0abd65415a461c6dddfefffaaeb1d5adc.tar.gz
documentation: fix singular vs. plural
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-show-branch.txt')
-rw-r--r--Documentation/git-show-branch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 58cf6210cd..080b5246a4 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -154,7 +154,7 @@ $ git show-branch master fixes mhf
! [mhf] Allow "+remote:local" refspec to cause --force when fetching.
---
+ [mhf] Allow "+remote:local" refspec to cause --force when fetching.
- + [mhf~1] Use git-octopus when pulling more than one heads.
+ + [mhf~1] Use git-octopus when pulling more than one head.
+ [fixes] Introduce "reset type" flag to "git reset"
+ [mhf~2] "git fetch --force".
+ [mhf~3] Use .git/remote/origin, not .git/branches/origin.