From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Dec 2020 21:59:46 +0000 (-0800)
Subject: Merge branch 'ma/maintenance-crontab-fix'
X-Git-Tag: v2.30.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5026529529e811b41de02ca12aa6c8ff3d11c5;p=thirdparty%2Fgit.git

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
---

7a5026529529e811b41de02ca12aa6c8ff3d11c5