git-merge-recursive: honor merge.conflictstyle once again
[gitweb.git] / contrib / hooks /
2008-10-19 Merge branch 'pb/rename-rowin32'
2008-10-18 Merge branch 'maint'
2008-10-18 Merge branch 'db/maint-checkout-b' into maint
2008-10-18 Merge branch 'pb/commit-where'
2008-10-17 Merge branch 'maint'
2008-10-14 Add Linux PPC support to the pre-auto-gc example hook
2008-10-13 Merge branch 'maint'
2008-10-12 Merge branch 'maint'
2008-10-10 Merge branch 'maint'
2008-10-09 Merge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Merge branch 'jc/add-ita'
2008-10-09 Merge branch 'maint'
2008-10-08 Merge branch 'maint'
2008-10-06 Merge branch 'maint'
2008-10-03 Merge branch 'maint'
2008-10-01 Merge branch 'maint'
2008-09-30 Merge branch 'maint'
2008-09-30 Add OS X support to the pre-auto-gc example hook
2008-09-29 Merge branch 'maint' into bc/master-diff-hunk-header-fix
2008-09-29 Merge branch 'bc/maint-diff-hunk-header-fix' into maint
2008-09-29 Merge branch 'jc/better-conflict-resolution'
2008-09-29 Merge branch 'mg/maint-remote-fix' into maint
2008-09-25 Merge branch 'mv/merge-recursive'
2008-09-25 Merge branch 'jc/alternate-push'
2008-09-25 Merge branch 'am/status'
2008-09-25 Merge branch 'pb/autocorrect-wrapper'
2008-09-25 Merge branch 'mv/commit-tree'
2008-09-25 Merge branch 'jc/apply-include-exclude'
2008-09-25 Merge branch 'jc/safe-c-l-d'
2008-09-25 Merge branch 'ho/dirstat-by-file'
2008-09-25 Merge git://repo.or.cz/git-gui
2008-09-22 Merge branch 'maint'
2008-09-22 Use dashless git commands in setgitperms.perl
2008-09-07 Merge updated git-gui and gitk that call each other
2008-09-06 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-08 Merge branch 'lt/racy-empty' into maint
2008-07-07 Merge branch 'dr/ceiling'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-27 Merge branch 'maint-1.5.5' into maint
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
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-26 Merge branch 'maint-1.5.4' into maint
2008-05-26 Ignore no-op changes in paranoid update hook
2008-05-26 Don't load missing ACL files in paranoid update hook
2008-05-26 Don't diff empty tree on branch creation in paranoid...
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'maint'
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Merge branch 'maint'
2008-05-21 Merge branch 'maint-1.5.4' into maint
2008-05-21 Merge branch 'jk/maint-send-email-compose'
2008-05-21 Merge branch 'hb/maint-send-email-quote-recipients'
2008-05-17 Merge branch 'maint'
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 Merge branch 'maint'
2008-05-14 Merge branch 'maint-1.5.4' into maint
2008-05-12 Merge branch 'gp/bisect-fix'
2008-05-11 Merge branch 'maint'
2008-05-11 Merge branch 'maint-1.5.4' into maint
2008-05-11 Merge branch 'lt/case-insensitive'
2008-05-09 Merge branch 'maint'
2008-05-09 Merge branch 'maint-1.5.4' into maint
2008-05-09 Merge branch 'sg/merge-options' (early part)
2008-05-06 Merge branch 'jc/lstat'
2008-05-06 Merge branch 'bc/filter-branch'
2008-05-06 Merge branch 'lh/git-file'
2008-05-06 Merge branch 'jk/fetch-status'
2008-05-06 Merge branch 'lh/branch-merged'
2008-05-06 Merge branch 'pb/remote-mirror-config'
2008-05-04 Merge branch 'maint'
2008-05-04 Merge branch 'maint-1.5.4' into maint
2008-05-03 Merge commit 'sg/merge-options^' into jk/renamelimit
2008-04-30 Merge branch 'maint'
2008-04-30 Merge branch 'maint'
2008-04-30 Merge branch 'maint-1.5.4' into maint
next