pre-commit hook: complain about conflict markers.
[git] / diffcore-pickaxe.c
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-08  Junio C HamanoMerge branch 'nh/http'
2006-04-08  Junio C HamanoMerge branch 'jc/blame'
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07  Junio C HamanoMerge branch 'maint'
2006-04-07  Junio C HamanoMerge branch 'jc/blame' into next
2006-04-05  Junio C HamanoMerge branch 'jc/blame' into next
2006-04-05  Junio C HamanoMerge branch 'nh/http' into next
2006-04-05  Junio C HamanoMerge branch 'jc/clone'
2006-04-05  Junio C HamanoMerge branch 'pb/regex'
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05  Junio C HamanoMerge branch 'jc/combine' into next
2006-04-05  Junio C HamanoMerge branches 'master' and 'jc/combine' into next
2006-04-05  Junio C HamanoMerge branch 'nh/http' into next
2006-04-05  Junio C HamanoMerge branch 'pb/regex' into next
2006-04-05  Johannes SchindelinOn some platforms, certain headers need to be included...
2006-04-04  Junio C HamanoMerge branch 'jc/combine' into next
2006-04-04  Junio C HamanoMerge branch 'pb/regex' into next
2006-04-04  Petr BaudisSupport for pickaxe matching regular expressions
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-08-30  Junio C HamanoMerge refs/heads/master from paulus
2005-08-19  Junio C HamanoMerge from gitk
2005-08-18  Junio C HamanoMerge with gitk --parents change.
2005-08-18  Junio C HamanoMerge with gitk
2005-08-12  Junio C HamanoMerge with gitk.
2005-08-10  Junio C HamanoMerge with gitk.
2005-08-09  Junio C HamanoMerge with gitk.
2005-08-08  Junio C HamanoMerge with gitk.
2005-08-07  Junio C HamanoMerge with gitk.
2005-08-06  Junio C HamanoMerge with gitk.
2005-08-05  Junio C HamanoMerge with gitk.
2005-07-31  Junio C HamanoMerge with gitk.
2005-07-29  Junio C HamanoMerge with gitk.
2005-07-24  Junio C Hamano[PATCH] diffcore-pickaxe: switch to "counting" behaviour.
2005-07-18  Linus TorvaldsMerge master.kernel.org:/pub/scm/gitk/gitk
2005-07-16  Linus TorvaldsMerge git-tools repository under "tools" subdirectory
2005-07-06  Linus TorvaldsMerge master.kernel.org:/pub/scm/gitk/gitk
2005-06-28  Linus TorvaldsMerge rsync://rsync.kernel.org/pub/scm/gitk/gitk
2005-06-22  Linus TorvaldsDo a cross-project merge of Paul Mackerras' gitk visualizer
2005-05-29  Junio C Hamano[PATCH] Do not include unused header files.
2005-05-29  Junio C Hamano[PATCH] Optimize diff-tree -[CM] --stdin
2005-05-29  Junio C Hamano[PATCH] Add --pickaxe-all to diff-* brothers.
2005-05-29  Junio C Hamano[PATCH] Introduce diff_free_filepair() funcion.
2005-05-23  Junio C Hamano[PATCH] Performance fix for pickaxe.
2005-05-23  Junio C Hamano[PATCH] Rename/copy detection fix.
2005-05-22  Junio C Hamano[PATCH] Diffcore updates.
2005-05-22  Junio C Hamano[PATCH] The diff-raw format updates.
2005-05-22  Junio C Hamano[PATCH] Prepare diffcore interface for diff-tree header...
2005-05-21  Junio C Hamano[PATCH] Introducing software archaeologist's tool ...