| commit | 5c2e65497be246c6b61e772e79f54b346baf5f49 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jun 2015 19:00:25 +0000 (5 12:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jun 2015 19:00:25 +0000 (5 12:00 -0700) | ||
| tree | 4794aea09bee2e7a19aa2bfae240498db985e70e | treesnapshot (tar.gz zip) |
| parent | 4cb9fe35c015c576177d6a0ce096c935876544fc | commitdiff |
| parent | 0544574cdcd5b368e757fa7bb561c616f81febb9 | commitdiff |
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
"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 | diff1 | diff2 | blobhistory |