git-daemon: timeout, eliminate double DWIM
[gitweb.git] / git-merge-stupid.sh
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-11 Use Daniel's read-tree in the merge strategy 'resolve'.