diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:48 -0700 |
| commit | bd3941a0aed0756aba43f504d0dea7a3fbe0c82b (patch) | |
| tree | 17d9c22f6491f77904aa727ccfc833c9150d441b /git-rebase--merge.sh | |
| parent | Merge branch 'js/mingw-o-append' (diff) | |
| parent | rerere: avoid buffer overrun (diff) | |
| download | tgif-bd3941a0aed0756aba43f504d0dea7a3fbe0c82b.tar.xz | |
Merge branch 'en/rerere-multi-stage-1-fix'
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 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions