t6021: add a new test for git-merge-resolve
[gitweb.git] / daemon.c
2008-06-27 Merge branch 'maint-1.5.5' into maint
2008-06-25 Merge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-22 Merge branch 'lt/racy-empty'
2008-06-22 Merge branch 'jc/maint-combine-diff-pre-context'
2008-06-17 Merge branch 'maint'
2008-06-16 Merge branch 'maint'
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11 Merge branch 'maint'
2008-06-09 Merge branch 'js/merge-recursive'
2008-06-09 Merge branch 'maint'
2008-06-07 Merge 1.5.5.4 in
2008-06-06 Merge branch 'maint'
2008-06-04 Merge branch 'maint'
2008-05-28 Merge 1.5.5.3 in
2008-05-27 Merge branch 'jc/diff-no-no-index'
2008-05-27 Merge branch 'maint'
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint'
2008-05-25 Merge branch 'js/config-cb' v1.5.6-rc0
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Provide git_config with a callback-data parameter
2008-04-09 Merge branch 'jc/rename'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-12 Merge branch 'js/remote'
2008-03-11 Merge branch 'jc/cherry-pick' (early part)
2008-03-11 Merge branch 'kb/maint-filter-branch-disappear' into...
2008-03-11 Merge branch 'aw/maint-shortlog-blank-lines' into maint
2008-03-09 Merge branch 'ph/parseopt'
2008-03-09 Merge branch 'kb/maint-filter-branch-disappear'
2008-03-08 Merge branch 'aw/maint-shortlog-blank-lines'
2008-03-08 Merge branch 'mh/maint-http-proxy-fix' into maint
2008-03-08 Merge branch 'js/maint-daemon' into maint
2008-03-08 Merge branch 'maint'
2008-03-08 Merge branch 'js/reflog-delete'
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-04 Merge branch 'maint'
2008-03-03 Merge branch 'maint'
2008-03-03 Merge branch 'np/verify-pack'
2008-03-02 Merge branch 'sp/describe-tag'
2008-03-02 Merge branch 'pb/cvsimport'
2008-03-02 Merge branch 'jc/maint-log-merge-left-right'
2008-03-02 Merge branch 'mh/maint-http-proxy-fix'
2008-03-02 Merge branch 'cb/http-test'
2008-03-02 Merge branch 'jc/remote-multi-url'
2008-03-02 Merge branch 'jn/gitweb-grep'
2008-03-02 Merge branch 'mk/maint-parse-careful'
2008-03-02 Merge branch 'sb/describe-long'
2008-03-02 Merge branch 'ew/maint-svn-cert-fileprovider'
2008-03-02 Merge branch 'js/maint-daemon'
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-01 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-02-27 daemon: ensure that base-path is an existing directory
2008-02-27 daemon: send more error messages to the syslog
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-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-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-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-05 Merge git://repo.or.cz/git-gui
2007-12-31 Merge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-18 Merge branch 'maint'
2007-12-09 Merge branch 'jc/spht'
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 Merge branch 'maint'
2007-11-29 Merge branch 'maint'
2007-11-26 Merge branch 'maint'
2007-11-25 Merge branch '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 Merge branch 'maint'
2007-11-19 Merge branch 'maint'
2007-11-19 Merge branch 'lt/rev-list-interactive'
2007-11-18 Merge branch 'maint' to synchronize with 1.5.3.6
2007-11-18 Merge branch 'ph/parseopt-sh'
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'
next