merge-recursive: handle D/F conflict case more carefully.
[git] / server-info.c
2007-03-22  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-20  Junio C HamanoMerge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-03-12  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-06  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-25  Junio C HamanoMerge git://repo.or.cz/git-gui into maint
2007-02-21  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui into...
2007-02-18  Junio C HamanoMerge git://git./pub/scm/gitk/gitk into maint
2007-02-14  Junio C HamanoMerge branch 'js/reverse'
2007-02-14  Junio C HamanoMerge branch 'jc/diff-apply-patch'
2007-02-14  Junio C HamanoMerge branch 'jc/merge-base' (early part)
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12  Junio C HamanoMerge git-gui
2007-02-08  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git/fastimport
2007-02-04  Junio C HamanoMerge branch 'master' into np/dreflog
2007-01-31  Junio C HamanoMerge branch 'master' of git://linux-nfs.org/~bfields/git
2007-01-31  Shawn O. PearceDon't coredump on bad refs in update-server-info.
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-13  Junio C HamanoMerge branch 'maint'
2006-11-12  Junio C HamanoMerge branch 'maint'
2006-11-11  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-09  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-11-08  Junio C HamanoMerge branch 'maint'
2006-11-08  Junio C HamanoMerge branch 'jc/pickaxe'
2006-11-07  Junio C HamanoMerge branch 'jc/read-tree'
2006-11-07  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'maint'
2006-11-05  Junio C HamanoMerge branch 'lt/push-config'
2006-11-05  Junio C HamanoMerge branch 'pb/web'
2006-11-04  Junio C HamanoMerge branch 'maint'
2006-11-03  Junio C HamanoMerge branch 'master' into np/index-pack
2006-11-03  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'maint'
2006-11-01  Junio C HamanoMerge branch 'rs/cherry'
2006-11-01  Junio C HamanoMerge branch 'lj/refs'
2006-10-17  Junio C HamanoMerge branch 'maint'
2006-10-02  Junio C HamanoMerge branch 'master' into lj/refs
2006-10-02  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'sb/fetch' into jc/refs-and-fetch
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-09-28  Junio C HamanoMerge branch 'master' into lj/refs
2006-09-28  Junio C HamanoMerge branch 'jc/for-each-ref' into jc/ref-locking
2006-09-21  Junio C HamanoMerge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
2006-09-21  Junio C HamanoMerge branch 'lt/refs' into jc/for-each-ref-with-lt...
2006-09-21  Junio C HamanoTell between packed, unpacked and symbolic refs.
2006-09-21  Junio C HamanoAdd callback data to for_each_ref() family.
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-07  Junio C HamanoMerge branch 'jc/daemon'
2006-09-03  Junio C HamanoMerge branch 'master' into cc/trace
2006-09-02  Shawn PearceReplace uses of strdup with xstrdup.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-25  Junio C HamanoMerge branch 'jc/clone-bind-failure'
2006-07-25  Junio C HamanoMerge branch 'lt/objformat'
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1
2006-07-14  Junio C HamanoMerge branch 'lt/unitype'
2006-07-14  Junio C HamanoMerge branch 'lt/unitype' into js/c-merge-recursive
2006-07-13  Linus TorvaldsRemove TYPE_* constant macros and use object_type enums...
2006-07-13  Junio C HamanoMerge branch 'ml/trace'
2006-07-13  Junio C HamanoMerge branch 'lt/prune'
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree'
2006-07-10  Junio C HamanoMerge branch 'jc/show-merge'
2006-07-10  Junio C HamanoMerge branch 'lt/gitweb'
2006-07-10  Junio C HamanoMerge branch 'jc/rename'
2006-07-10  Junio C HamanoMerge branch 'jc/grep'
2006-07-10  Junio C HamanoMerge branch 'jc/mailinfo'
2006-07-10  Junio C HamanoMerge branch 'ew/diff'
2006-07-10  Junio C HamanoMerge branch 'ew/svn'
2006-07-09  Pavel RoskinAssorted typo fixes
2006-06-22  Junio C HamanoMerge early parts of branch 'js/diff'
2006-06-19  Junio C HamanoMerge branch 'jc/shared'
2006-06-18  Junio C HamanoMerge branch 'eb/mail' into next
2006-06-18  Linus TorvaldsShrink "struct object" a bit
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04  Junio C HamanoMerge branch 'new' of git://git./gitk/gitk into next
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
next