From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2015 20:24:42 +0000 (-0700)
Subject: Merge branch 'jk/rerere-forget-check-enabled'
X-Git-Tag: v2.5.0-rc0~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c37d7b50f345e8f52e3e902384cd87d96decc155;p=thirdparty%2Fgit.git

Merge branch 'jk/rerere-forget-check-enabled'

"git rerere forget" in a repository without rerere enabled gave a
cryptic error message; it should be a silent no-op instead.

* jk/rerere-forget-check-enabled:
  rerere: exit silently on "forget" when rerere is disabled
---

c37d7b50f345e8f52e3e902384cd87d96decc155