Use Daniel's read-tree in the merge strategy 'resolve'.
[gitweb.git] / Documentation / glossary.txt
2005-08-30 Merge refs/heads/master from paulus
2005-08-29 Merge refs/heads/portable from cs.berkeley.edu/~ejr...
2005-08-27 Merge refs/heads/master from .
2005-08-26 [PATCH] More missing terms in glossary.txt
2005-08-19 Merge from gitk
2005-08-18 Merge with master.
2005-08-18 [PATCH] Updates to glossary
2005-08-18 Merge with gitk --parents change.
2005-08-18 Merge with master for gitk and doc updates.
2005-08-18 Merge with gitk
2005-08-18 [PATCH] Assorted changes to glossary
2005-08-17 Merge changes from master.
2005-08-17 [PATCH] Add GIT glossary