diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-05 13:28:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-05 13:28:09 -0800 |
| commit | 843d94b3cd30e61c7c4879f9bc6d013021b9350a (patch) | |
| tree | 8e9700c13e1b66580c1cb729f0274fe6bb5567a9 /t/t5615-alternate-env.sh | |
| parent | Merge branch 'db/doc-config-section-names-with-bs' (diff) | |
| parent | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with... (diff) | |
| download | tgif-843d94b3cd30e61c7c4879f9bc6d013021b9350a.tar.xz | |
Merge branch 'ew/empty-merge-with-dirty-index'
"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.
* ew/empty-merge-with-dirty-index:
merge-recursive: avoid incorporating uncommitted changes in a merge
move index_has_changes() from builtin/am.c to merge.c for reuse
t6044: recursive can silently incorporate dirty changes in a merge
Diffstat (limited to 't/t5615-alternate-env.sh')
0 files changed, 0 insertions, 0 deletions