projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cb9fe3 0544574)
Merge branch 'jk/rerere-forget-check-enabled' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:25 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:25 +0000 (12:00 -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 patch | diff1 | diff2 | blob | history

diff --cc rerere.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.