diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-22 12:48:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-22 12:48:38 -0800 |
| commit | b6825b5c8e8b58943511f2576475accf1593486e (patch) | |
| tree | de8bc8a4fdf954c8870cb1a1d60f3d38b781d12f /server-info.c | |
| parent | 936d1b989416a95f593bf81ccae8ac62cd83f279 (diff) | |
| parent | 65170c07d466b18364e0d2b6a360900c073b600f (diff) | |
| download | git-b6825b5c8e8b58943511f2576475accf1593486e.tar.gz git-b6825b5c8e8b58943511f2576475accf1593486e.tar.xz | |
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
* ew/empty-merge-with-dirty-index-maint:
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 'server-info.c')
0 files changed, 0 insertions, 0 deletions