From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Mar 2022 05:25:30 +0000 (-0800)
Subject: Merge branch 'jc/rerere-train-modernise'
X-Git-Tag: v2.36.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50e0dd8fee3828adafc27fc7c0a5262137577ddf;p=thirdparty%2Fgit.git

Merge branch 'jc/rerere-train-modernise'

Small modernization of the rerere-train script (in contrib/).

* jc/rerere-train-modernise:
  rerere-train: two fixes to the use of "git show -s"
---

50e0dd8fee3828adafc27fc7c0a5262137577ddf