Add a second testcase for handling invalid strategies in git-merge
[gitweb.git] / GIT-VERSION-GEN
2008-02-25 Merge branch 'jc/apply-whitespace'
2008-02-24 Merge branch 'maint'
2008-02-23 Sync with 1.5.4.3
2008-02-23 GIT 1.5.4.3 v1.5.4.3
2008-02-23 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-23 Merge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-22 Merge branch 'maint'
2008-02-21 Merge branch 'js/maint-cvsexport'
2008-02-21 Merge branch 'js/maint-http-push'
2008-02-21 Merge branch 'jk/empty-tree'
2008-02-21 Merge branch 'lt/revision-walker'
2008-02-21 Merge branch 'mc/prefix'
2008-02-21 Merge branch 'bc/fopen'
2008-02-21 Merge branch 'jc/setup'
2008-02-21 Merge branch 'maint'
2008-02-20 Merge branch 'maint'
2008-02-19 Merge branch 'mk/maint-parse-careful'
2008-02-18 Merge branch 'br/gitweb'
2008-02-17 Sync with 1.5.4.2 and start 1.5.5 Release Notes
2008-02-17 Merge branch 'maint'
2008-02-17 GIT 1.5.4.2 v1.5.4.2
2008-02-17 Merge git://repo.or.cz/git-gui
2008-02-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-13 Merge git://repo.or.cz/git-gui
2008-02-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-02-12 Merge branch 'lt/in-core-index'
2008-02-12 Merge branch 'ph/describe-match'
2008-02-02 GIT 1.5.4 v1.5.4
2008-01-27 GIT 1.5.4-rc5 v1.5.4-rc5
2008-01-24 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://repo.or.cz/git-gui
2008-01-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-12 GIT 1.5.4-rc3 v1.5.4-rc3
2008-01-11 Merge ../gitk
2008-01-09 Merge branch 'master' of git://git./gitk/gitk
2008-01-08 Merge in GIT 1.5.3.8
2008-01-08 GIT 1.5.3.8 v1.5.3.8
2008-01-05 Merge git://repo.or.cz/git-gui
2007-12-31 Merge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-27 GIT 1.5.4-rc2 v1.5.4-rc2
2007-12-20 GIT 1.5.4-rc1 v1.5.4-rc1
2007-12-18 Merge branch 'maint'
2007-12-13 GIT 1.5.4-rc0 v1.5.4-rc0
2007-12-09 Merge branch 'maint'
2007-12-07 Merge branch 'master' of git://repo.or.cz/git-gui
2007-12-07 Merge branch 'maint'
2007-12-06 Merge branch 'maint'
2007-12-05 Merge branch 'nd/maint-work-tree-fix' into maint
2007-12-02 Merge branch 'maint'
2007-12-01 Merge 1.5.3.7 in
2007-12-01 GIT 1.5.3.7 v1.5.3.7
2007-12-01 Merge branch 'maint'
2007-11-29 Merge branch 'maint'
2007-11-26 Merge branch 'maint'
2007-11-25 Merge branch 'maint'
2007-11-25 Merge branch 'rv/maint-index-commit' into maint
2007-11-25 Merge branch 'lt/maint-rev-list-gitlink' into maint
2007-11-25 Merge branch 'jc/maint-add-sync-stat' into maint
2007-11-25 Merge branch 'jc/maint-format-patch-encoding' into...
2007-11-25 Merge branch 'bs/maint-t7005' into maint
2007-11-25 Merge branch 'bs/maint-commit-options' into maint
2007-11-23 Merge branch 'maint'
2007-11-23 Merge branch 'maint'
2007-11-21 Merge git://repo.or.cz/git-gui
2007-11-21 git-gui 0.9.0 gitgui-0.9.0
2007-11-21 Merge branch 'maint'
2007-11-19 Merge branch 'maint'
2007-11-19 Merge branch 'maint' of git://linux-nfs.org/~bfields...
2007-11-18 Merge branch 'maint' to synchronize with 1.5.3.6
2007-11-18 GIT 1.5.3.6 v1.5.3.6
2007-11-17 Merge branch 'maint'
2007-11-14 Merge branch 'bs/maint-commit-options'
2007-11-14 Merge branch 'rv/maint-index-commit'
2007-11-14 Merge branch 'bs/maint-t7005'
2007-11-14 Merge branch 'jc/maint-add-sync-stat'
2007-11-14 Merge branch 'maint'
2007-11-12 Merge branch 'maint'
2007-11-12 Merge branch 'sp/maint-plug-traverse-commit-list-leak...
2007-11-11 Merge branch 'maint'
2007-11-10 Merge branch 'maint'
2007-11-09 Merge branch 'maint'
2007-11-08 Merge branch 'jc/clean-config'
2007-11-08 Merge branch 'ds/maint-deflatebound'
2007-11-08 Merge branch 'maint'
2007-11-06 Merge branch 'maint'
2007-11-04 Merge branch 'maint'
2007-11-02 Merge branch 'maint'
2007-11-02 Merge branch 'gp/maint-diffdoc'
2007-11-02 Merge branch 'maint'
2007-11-01 Merge branch 'bk/maint-cvsexportcommit'
2007-10-31 Merge branch 'maint' to catch up with 1.5.3.5
2007-10-31 GIT 1.5.3.5 v1.5.3.5
2007-10-31 Merge branch 'maint' into HEAD
2007-10-29 Merge branch 'maint'
2007-10-28 Merge branch 'master' of git://git./gitk/gitk
2007-10-27 Merge branch 'maint'
2007-10-21 Merge branch 'maint'
2007-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-10-21 Merge branch 'maint' of git://repo.or.cz/git-gui into...
next