diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:43 -0700 |
| commit | a2a0942a16a6459d4a52e7ee4ec85f7f90ad5334 (patch) | |
| tree | 83dcf90fd0897ccf3974021dddd6e48042c89637 /diff.c | |
| parent | Merge branch 'jc/codingstyle-compare-with-null' (diff) | |
| parent | rebase --autosquash: fix a potential segfault (diff) | |
| download | git-a2a0942a16a6459d4a52e7ee4ec85f7f90ad5334.tar.gz git-a2a0942a16a6459d4a52e7ee4ec85f7f90ad5334.zip | |
Merge branch 'js/rebase-autosquash-double-fixup-fix'
"rebase -i" segfaulted when rearranging a sequence that has a
fix-up that applies another fix-up (which may or may not be a
fix-up of yet another step).
* js/rebase-autosquash-double-fixup-fix:
rebase --autosquash: fix a potential segfault
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions