Merge branch 'jc/ident'
[gitweb.git] / Documentation / merge-options.txt
2006-02-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-12 GIT 0.99.9m aka 1.0rc5 v0.99.9mv1.0rc5
2005-12-08 Documentation: recursive is the default strategy these...
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-11-07 Merge branch 'master'
2005-11-07 Refactored merge options into separate merge-options...