projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b6825b5 f309e8e)
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 18:41:37 +0000 (10:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jan 2018 18:41:37 +0000 (10:41 -0800)
commit5b1c54ac99e6847eaff409cd6fb328fd0f8d9076
treef8016300d5cd7bbf3cdc062ccaca86238879da6dtree | snapshot
parentb6825b5c8e8b58943511f2576475accf1593486ecommit | diff
parentf309e8e768ec5de97e8ab3dcd223f32865176290commit | 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: do not look at the index during recursive merge
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.