Use Daniel's read-tree in the merge strategy 'resolve'.
[git] / index.c
2005-08-30  Junio C HamanoMerge refs/heads/master from paulus
2005-08-19  Junio C HamanoMerge from gitk
2005-08-18  Junio C HamanoMerge with gitk --parents change.
2005-08-18  Junio C HamanoMerge with gitk
2005-08-12  Junio C HamanoMerge with gitk.
2005-08-10  Junio C HamanoMerge with gitk.
2005-08-09  Junio C HamanoMerge with gitk.
2005-08-08  Junio C HamanoMerge with gitk.
2005-08-07  Junio C HamanoMerge with gitk.
2005-08-06  Junio C HamanoMerge with gitk.
2005-08-05  Junio C HamanoMerge with gitk.
2005-07-31  Junio C HamanoMerge with gitk.
2005-07-29  Junio C HamanoMerge with gitk.
2005-07-18  Linus TorvaldsMerge master.kernel.org:/pub/scm/gitk/gitk
2005-07-16  Linus TorvaldsMerge git-tools repository under "tools" subdirectory
2005-07-06  Linus TorvaldsMerge master.kernel.org:/pub/scm/gitk/gitk
2005-06-28  Linus TorvaldsMerge rsync://rsync.kernel.org/pub/scm/gitk/gitk
2005-06-22  Linus TorvaldsDo a cross-project merge of Paul Mackerras' gitk visualizer
2005-05-19  Junio C Hamano[PATCH] Implement git-checkout-cache -u to update stat...