diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:33 -0700 |
| commit | 5a5c5e95653f8db61ca9d1a30159dcf5dc4a8d6a (patch) | |
| tree | 5e007fc315fb147b9cd06ec40a4a0f67b2f88077 /builtin/diff-tree.c | |
| parent | Merge branch 'pw/rebase-i-squash-number-fix' (diff) | |
| parent | rebase -i: fix SIGSEGV when 'merge <branch>' fails (diff) | |
| download | tgif-5a5c5e95653f8db61ca9d1a30159dcf5dc4a8d6a.tar.xz | |
Merge branch 'pw/rebase-i-merge-segv-fix'
"git rebase -i", when a 'merge <branch>' insn in its todo list
fails, segfaulted, which has been (minimally) corrected.
* pw/rebase-i-merge-segv-fix:
rebase -i: fix SIGSEGV when 'merge <branch>' fails
t3430: add conflicting commit
Diffstat (limited to 'builtin/diff-tree.c')
0 files changed, 0 insertions, 0 deletions