apply: check D/F conflicts more carefully.
[gitweb.git] / read-cache.c
2006-07-13 Merge branch 'ml/trace'
2006-07-13 Merge branch 'js/merge-base'
2006-07-13 Merge branch 'lt/prune'
2006-07-13 Merge branch 'lt/merge-tree'
2006-07-10 Merge branch 'jc/show-merge'
2006-07-10 Avoid C99 comments, use old-style C comments instead.
2006-06-22 Merge branch 'js/lsfix'
2006-06-22 Merge branch 'ew/rebase'
2006-06-22 Merge branch 'jn/web'
2006-06-22 Merge early parts of branch 'js/diff'
2006-06-22 Merge branch 'jc/upload-corrupt'
2006-06-22 Merge branch 'ew/rebase' into next
2006-06-22 Merge branch 'jn/web' into next
2006-06-22 Merge branch 'jc/waitpid'
2006-06-22 Merge branch 'ff/c99'
2006-06-22 Merge branch 'master' into next
2006-06-21 Merge branch 'jc/upload-corrupt' into next
2006-06-21 Merge branch 'jn/web' into next
2006-06-21 Merge branch 'ew/rebase' into next
2006-06-21 Merge branch 'ff/c99' into next
2006-06-20 Remove all void-pointer arithmetic.
2006-06-18 Merge early part of branch 'jc/fetchupload'
2006-06-18 Merge branch 'jc/rw-prefix'
2006-06-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10 Merge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04 Merge branch 'new' of git://git./gitk/gitk into next
2006-06-04 Merge branch 'sp/reflog'
2006-06-02 Merge branch 'nh/http'
2006-06-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-01 Merge branch 'nh/http' into next
2006-05-31 Merge branch 'sp/reflog' into next
2006-05-30 Merge branch 'ew/tests'
2006-05-29 Merge branch 'lt/apply'
2006-05-29 Merge branch 'jc/cache-tree'
2006-05-29 Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree
2006-05-29 Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...
2006-05-28 Merge branch 'jc/cache-tree' into next
2006-05-28 Merge branch 'master' into next
2006-05-28 Merge branch 'jc/mailinfo'
2006-05-28 Merge branch 'eb/mailinfo'
2006-05-28 git-write-tree writes garbage on sparc64
2006-05-26 Merge branch 'master' into next
2006-05-26 Merge branch 'eb/mailinfo' into next
2006-05-26 Merge branch 'ew/tests' into next
2006-05-25 Merge branch 'sp/reflog' into next
2006-05-25 Merge branch 'jc/fetchupload' into next
2006-05-24 Merge branch 'sp/reflog' into next
2006-05-24 Merge branch 'master' into sp/reflog
2006-05-24 Merge branch 'lt/apply' into next
2006-05-24 Merge branch 'master' into lt/apply
2006-05-24 Merge branch 'jc/fmt-patch'
2006-05-24 Merge branch 'be/tag'
2006-05-24 Merge branch 'js/fmt-patch'
2006-05-24 Merge branch 'jc/builtin-n-tar-tree'
2006-05-24 Merge branch 'jc/fetch-sorted'
2006-05-24 Merge branch 'lt/dirwalk'
2006-05-24 Merge branch 'master' into next
2006-05-23 Merge branch 'master' into next
2006-05-23 Merge branch 'sp/reflog' into next
2006-05-23 Merge branch 'eb/mailinfo' into next
2006-05-23 Merge branch 'be/tag' into next
2006-05-23 Merge branch 'jc/builtin-n-tar-tree' into next
2006-05-23 Merge branch 'master' into next
2006-05-23 Merge branch 'se/http' into next
2006-05-23 Merge branch 'jc/fmt-patch' into next
2006-05-22 Merge branch 'jc/fetch-sorted' into next
2006-05-22 Merge branch 'master' into next
2006-05-22 Merge branch 'jc/mailinfo' into next
2006-05-21 Merge branch 'js/fmt-patch' into next
2006-05-21 Merge branch 'js/fmt-patch' into next
2006-05-21 Merge branch 'master' into js/fmt-patch
2006-05-20 Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
2006-05-20 Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...
2006-05-20 Merge branch 'jc/tartree' into next
2006-05-20 Merge branch 'master' into next
2006-05-20 Merge branch 'js/fetchconfig'
2006-05-20 Merge branch 'lt/dirwalk' into next
2006-05-20 Merge branch 'jc/read-tree-safety'
2006-05-19 Merge branch 'jc/apply'
2006-05-19 Merge branch 'eb/quilt'
2006-05-19 Merge branch 'jc/grep'
2006-05-19 Merge branch 'lt/grep'
2006-05-19 Merge branch 'ts/doctar'
2006-05-19 Libify the index refresh logic
2006-05-19 Merge part of 'js/fmt-patch' for RFC2822 dates into...
2006-05-19 Merge branch 'eb/quilt' into next
2006-05-19 Merge branch 'ts/doctar' into next
2006-05-19 Merge branch 'lt/dirwalk' into next
2006-05-18 Prevent bogus paths from being added to the index.
2006-05-18 Merge branch 'lt/dirwalk' into next
2006-05-18 Merge branch 'master' into next
2006-05-18 Merge branch 'lt/dirwalk' into next
2006-05-18 Merge branch 'sp/reflog' into next
2006-05-17 Merge branch 'jc/apply' into next
2006-05-17 Merge branch 'jc/read-tree-safety' into next
2006-05-17 Merge branch 'lt/grep' into next
2006-05-17 Merge branch 'jc/grep' into next
2006-05-17 Merge branch 'lt/dirwalk' into next
2006-05-17 Merge branch 'jc/gitlink' into next
next