summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-12-23 13:59:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-23 13:59:46 -0800
commit7a5026529529e811b41de02ca12aa6c8ff3d11c5 (patch)
treec21a12770bad4b904073dab1a93c152e609d95e2 /Documentation
parentMerge branch 'dl/checkout-p-merge-base' (diff)
parentt7900-maintenance: test for magic markers (diff)
downloadtgif-7a5026529529e811b41de02ca12aa6c8ff3d11c5.tar.xz
Merge branch 'ma/maintenance-crontab-fix'
Hotfix for a topic of this cycle. * ma/maintenance-crontab-fix: t7900-maintenance: test for magic markers gc: fix handling of crontab magic markers git-maintenance.txt: add missing word
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-maintenance.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
index 6fec1eb8dc..d1f9b5172d 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -101,7 +101,7 @@ This is done to avoid disrupting the remote-tracking branches. The end users
expect these refs to stay unmoved unless they initiate a fetch. With prefetch
task, however, the objects necessary to complete a later real fetch would
already be obtained, so the real fetch would go faster. In the ideal case,
-it will just become an update to bunch of remote-tracking branches without
+it will just become an update to a bunch of remote-tracking branches without
any object transfer.
gc::