xdl_merge(): fix and simplify conflict handling
[git] / upload-pack.c
2006-12-03  Junio C HamanoMerge branch 'maint'
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-29  Junio C HamanoMerge branch 'maint'
2006-11-29  Junio C HamanoMerge branch 'maint'
2006-11-27  Junio C HamanoMerge branch 'js/shortlog'
2006-11-27  Junio C HamanoMerge branch 'jc/merge'
2006-11-27  Junio C HamanoMerge branch 'jc/pack-peeled'
2006-11-25  Junio C HamanoMerge branch 'master' into jc/globfetch
2006-11-24  Junio C HamanoMerge branch 'jn/web'
2006-11-24  Junio C HamanoMerge branch 'jc/pack-heuristics'
2006-11-24  Junio C HamanoMerge branch 'jc/numstat'
2006-11-24  Junio C HamanoMerge branch 'ap/branch-ref-display'
2006-11-24  Junio C HamanoMerge branch 'ap/prune'
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 'jc/refs-and-fetch'
2006-11-01  Junio C HamanoMerge branch 'lj/refs'
2006-10-31  Junio C HamanoMerge branch 'maint'
2006-10-27  Junio C HamanoMerge branch 'maint'
2006-10-26  Junio C HamanoMerge branch 'jc/combined'
2006-10-26  Junio C HamanoMerge branch 'jc/combined'
2006-10-25  Junio C HamanoMerge branch 'maint'
2006-10-25  Junio C HamanoMerge branch 'aw/cvsimport'
2006-10-25  Junio C HamanoMerge for-each-ref to sync gitweb fully with 'next'
2006-10-25  Junio C HamanoMerge branch 'jc/web-blame'
2006-10-25  Junio C HamanoMerge branch 'maint'
2006-10-24  Junio C HamanoMerge branch 'master' into jc/web
2006-10-24  Junio C HamanoMerge branch 'maint'
2006-10-23  Junio C HamanoMerge branch 'np/pack'
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-27  Nicolas Pitrelet the GIT native protocol use offsets to delta base...
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 branch 'sk/ftp'
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-18  Junio C HamanoMerge branch 'jc/pack'
2006-09-18  Junio C HamanoMerge branch 'jc/am'
2006-09-18  Junio C HamanoMerge branch 'jk/diff'
2006-09-17  Junio C HamanoMerge branch 'jc/archive'
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-11  Junio C HamanoMerge branch 'jc/sideband' into jc/archive
2006-09-10  Junio C HamanoPrepare larger packet buffer for upload-pack protocol.
2006-09-10  Junio C HamanoMove sideband server side support into reusable form.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive'
2006-08-28  Junio C HamanoMerge branch 'ts/daemon'
2006-08-28  Junio C HamanoMerge branch 'jc/apply'
2006-08-26  Junio C HamanoMerge branch 'master' into gl/web
2006-08-26  Junio C HamanoMerge branch 'gl/cleanup'
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next
2006-08-23  Shawn PearceConvert memcpy(a,b,20) to hashcpy(a,b).
2006-08-21  Junio C HamanoMerge branch 'maint'
2006-08-17  Junio C HamanoMerge branch 'jc/format-patch'
2006-08-16  Junio C HamanoMerge branch 'jc/racy'
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-16  David Rientjesremove unnecessary initializations
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-15  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-08-15  David RientjesMake upload_pack void and remove conditional return.
2006-08-14  Junio C HamanoMerge branch 'maint'
2006-08-13  Junio C Hamanoupload-pack: stop the other side when they have more...
2006-08-13  Junio C Hamanoupload-pack: minor clean-up in multi-ack logic
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-31  Junio C HamanoMerge branch 'js/read-tree' into js/c-merge-recursive
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-28  Junio C HamanoMerge branch 'jc/diff'
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 'jt/format-patch'
2006-07-25  Junio C HamanoMerge branch 'ew/apply'
next