summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:34 -0800
commit5149902ff9f22e47c5ab52687b540671947d9404 (patch)
treea1e6c469c9af4451fc0dd15411dbdf983f51ad3c /Documentation
parentMerge branch 'js/fetch-multi-lockfix' (diff)
parentname-hash.c: remove duplicate word in comment (diff)
downloadtgif-5149902ff9f22e47c5ab52687b540671947d9404.tar.xz
Merge branch 'en/misc-doc-fixes'
Misc doc fixes. * en/misc-doc-fixes: name-hash.c: remove duplicate word in comment hashmap: fix documentation misuses of -> versus . git-filter-branch.txt: correct argument name typo
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-filter-branch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 5876598852..1ba4667b12 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -649,7 +649,7 @@ create hoards of confusing empty commits
commits from before the filtering operation are also pruned instead of
just pruning commits that became empty due to filtering rules.
-* If --prune empty is specified, sometimes empty commits are missed
+* If --prune-empty is specified, sometimes empty commits are missed
and left around anyway (a somewhat rare bug, but it happens...)
* A minor issue, but users who have a goal to update all names and