diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:44 +0900 |
| commit | b4eafbcdb84fc406bff37f06fdf6310aca7d0249 (patch) | |
| tree | 89f6f96f46f64695ac84ad9a49e14017e573ef77 /builtin/replace.c | |
| parent | Merge branch 'js/mingw-o-append' into maint (diff) | |
| parent | rerere: avoid buffer overrun (diff) | |
| download | git-b4eafbcdb84fc406bff37f06fdf6310aca7d0249.tar.gz git-b4eafbcdb84fc406bff37f06fdf6310aca7d0249.zip | |
Merge branch 'en/rerere-multi-stage-1-fix' into maint
A corner case bugfix in "git rerere" code.
* en/rerere-multi-stage-1-fix:
rerere: avoid buffer overrun
t4200: demonstrate rerere segfault on specially crafted merge
Diffstat (limited to 'builtin/replace.c')
0 files changed, 0 insertions, 0 deletions