Merge branch 'jc/maint-add-u-remove-conflicted'
[gitweb.git] / Documentation / gitworkflows.txt
2008-10-21 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-10-19 Merge branch 'sh/maint-rebase3'
2008-10-19 Merge branch 'tr/workflow-doc'
2008-10-19 Documentation: add manpage about workflows