]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/rerere-forget-check-enabled'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:42 +0000 (13:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:42 +0000 (13:24 -0700)
"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

1  2 
rerere.c

diff --cc rerere.c
Simple merge