summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-05-13 14:05:07 -0700
committerJunio C Hamano <gitster@pobox.com>2025-05-13 14:05:07 -0700
commitacfcd7ca93e0f23893baee804e1f490c928363bd (patch)
tree513a6ae4f0a52b3458b1628a32867f236607eb4e
parent1551145edbd571ee6cb9677ee9aed21c92d6b336 (diff)
parent4ae2a3b4182ba05943ac587f36e4db13f81454cf (diff)
Merge branch 'kh/docfixes'
Docfixes. * kh/docfixes: doc: branch: fix inline-verbatim doc: reflog: fix `drop` subheading
-rw-r--r--Documentation/git-branch.adoc2
-rw-r--r--Documentation/git-reflog.adoc2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-branch.adoc b/Documentation/git-branch.adoc
index 50a1e13e1f..c0afddc424 100644
--- a/Documentation/git-branch.adoc
+++ b/Documentation/git-branch.adoc
@@ -373,7 +373,7 @@ $ git branch -D test <2>
------------
+
<1> Delete the remote-tracking branches "todo", "html" and "man". The next
- `git fetch` or `git pullè will create them again unless you configure them not to.
+ `git fetch` or `git pull` will create them again unless you configure them not to.
See linkgit:git-fetch[1].
<2> Delete the "test" branch even if the "master" branch (or whichever branch
is currently checked out) does not have all commits from the test branch.
diff --git a/Documentation/git-reflog.adoc b/Documentation/git-reflog.adoc
index b55c060569..412f06b8fe 100644
--- a/Documentation/git-reflog.adoc
+++ b/Documentation/git-reflog.adoc
@@ -138,7 +138,7 @@ Options for `delete`
used with `expire`.
Options for `drop`
-~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
--all::
Drop the reflogs of all references from all worktrees.