projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 936d1b9 65170c0)
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Dec 2017 20:48:38 +0000 (12:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Dec 2017 20:48:38 +0000 (12:48 -0800)
commitb6825b5c8e8b58943511f2576475accf1593486e
treede8bc8a4fdf954c8870cb1a1d60f3d38b781d12ftree | snapshot
parent936d1b989416a95f593bf81ccae8ac62cd83f279commit | diff
parent65170c07d466b18364e0d2b6a360900c073b600fcommit | diff
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
builtin/am.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.