Use Daniel's read-tree in the merge strategy 'resolve'.
[gitweb.git] / Documentation / git-hash-object.txt
2005-09-08 Big tool rename.
2005-08-30 Merge refs/heads/master from paulus
2005-08-19 Merge from gitk
2005-08-18 Merge with gitk --parents change.
2005-08-18 Merge with gitk
2005-08-12 Merge with gitk.
2005-08-10 Merge with gitk.
2005-08-09 Merge with gitk.
2005-08-08 Merge with gitk.
2005-08-07 Merge with gitk.
2005-08-06 Merge with gitk.
2005-08-06 [PATCH] Assorted documentation patches
2005-08-05 Merge with gitk.
2005-07-31 Merge with gitk.
2005-07-29 Merge with gitk.
2005-07-18 Merge master.kernel.org:/pub/scm/gitk/gitk
2005-07-16 Merge git-tools repository under "tools" subdirectory
2005-07-09 [PATCH] Expose object ID computation functions.