From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:25 +0000 (-0700)
Subject: Merge branch 'jk/rerere-forget-check-enabled' into maint
X-Git-Tag: v2.4.3~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c2e65497be246c6b61e772e79f54b346baf5f49;p=thirdparty%2Fgit.git

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

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

5c2e65497be246c6b61e772e79f54b346baf5f49