From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:07 +0000 (+0900)
Subject: Merge branch 'pw/rerere-autoupdate'
X-Git-Tag: v2.22.0-rc0~109
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=fffbf7c6ba3a3653b92329f879d238e6fea4dfce

Merge branch 'pw/rerere-autoupdate'

Doc updates.

* pw/rerere-autoupdate:
  merge: tweak --rerere-autoupdate documentation
  am/cherry-pick/rebase/revert: document --rerere-autoupdate
---

fffbf7c6ba3a3653b92329f879d238e6fea4dfce