Merge branch 'np/delta' into next
[gitweb.git] / git-merge-stupid.sh
2006-02-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
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'.