git-merge-recursive: honor merge.conflictstyle once again
[gitweb.git] / contrib / hooks /
2008-04-28 Merge branch 'maint'
2008-04-28 Merge branch 'maint-1.5.4' into maint
2008-04-25 Merge branch 'ho/shared'
2008-04-25 Merge branch 'maint'
2008-04-25 Merge branch 'maint-1.5.4' into maint
2008-04-23 Merge branch 'maint'
2008-04-23 Merge branch 'maint-1.5.4' into maint
2008-04-22 Merge branch 'maint'
2008-04-22 post-receive-email: fix accidental removal of a trailin...
2008-04-20 Merge branch 'maint'
2008-04-20 Merge branch 'jc/sha1-lookup'
2008-04-20 Merge branch 'jc/dirstat'
2008-04-20 Merge branch 'mv/defer-gc'
2008-04-19 Merge branch 'maint-1.5.4' into maint
2008-04-17 Merge branch 'maint-1.5.4' into maint
2008-04-16 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-10 Merge branch 'maint-1.5.4' into maint
2008-04-09 contrib/hooks: add an example pre-auto-gc hook
2008-04-09 Merge branch 'jc/rename'
2008-04-09 Merge branch 'mk/unpack-careful'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-07 Merge branch 'jc/maint-apply-match-beginning'
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-28 GIT 1.5.5-rc2 v1.5.5-rc2
2008-03-27 Merge branch 'maint'
2008-03-26 Merge branch 'jc/maint-fetch-regression-1.5.4'
2008-03-16 Merge branch 'maint'
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge branch 'py/submodule'
2008-03-15 Merge branch 'maint'
2008-03-15 Merge branch 'maint'
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-14 Merge branch 'maint'
2008-03-13 Merge branch 'maint'
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-12 Merge branch 'js/remote'
2008-03-12 Merge branch 'maint'
2008-03-11 Merge branch 'jc/cherry-pick' (early part)
2008-03-11 Merge branch 'maint'
2008-03-09 Merge branch 'ph/parseopt'
2008-03-09 Merge branch 'dp/clean-fix'
2008-03-09 Merge branch 'ml/submodule-add-existing'
2008-03-09 Merge branch 'mr/compat-snprintf'
2008-03-09 Merge branch 'sp/fetch-optim'
2008-03-09 Merge branch 'jc/describe-always'
2008-03-09 Merge branch 'jc/am'
2008-03-09 Merge branch 'cr/reset-parseopt'
2008-03-09 Merge branch 'jn/gitweb-pickaxe'
2008-03-09 Merge branch 'kb/maint-filter-branch-disappear'
2008-03-09 Merge branch 'maint' to sync with 1.5.4.4
2008-03-08 Merge branch 'aw/maint-shortlog-blank-lines'
2008-03-08 Merge branch 'maint'
2008-03-08 Merge branch 'js/reflog-delete'
2008-03-08 Merge branch 'dc/format-pretty'
2008-03-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-03-05 specify explicit "--pretty=medium" with `git log/show...
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-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-02-12 Merge branch 'ph/describe-match'
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-14 Remove usage of git- (dash) commands from email hook
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-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'
next