Merge branch 'jk/rerere-forget-check-enabled'
commitc37d7b50f345e8f52e3e902384cd87d96decc155
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:42 +0000 (26 13:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:42 +0000 (26 13:24 -0700)
tree81695a605f63cb897a142ff8312fe25cde392751
parent9532ead9875b7b92ff2007f9de61af5874e8839a
parent0544574cdcd5b368e757fa7bb561c616f81febb9
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
rerere.c