Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
[gitweb.git] / cache.h
2007-04-09 Merge branch 'jc/push'
2007-04-09 Merge branch 'jc/merge-subtree'
2007-04-09 Merge branch 'js/fetch-progress'
2007-04-09 Merge branch 'maint'
2007-04-08 Merge branch 'jc/read-tree-df' (early part)
2007-04-08 Merge branch 'maint'
2007-04-07 A new merge stragety 'subtree'.
2007-04-07 Merge branch 'jc/index-output'
2007-04-07 Merge branch 'jc/checkout' (early part)
2007-04-07 Merge branch 'maint'
2007-04-05 Merge branch 'maint'
2007-04-05 Rename add_file_to_index() to add_file_to_cache()
2007-04-05 Fix bogus error message from merge-recursive error...
2007-04-05 clean up and optimize nth_packed_object_sha1() usage
2007-04-04 git-read-tree --index-output=<file>
2007-04-04 _GIT_INDEX_OUTPUT: allow plumbing to output to an alter...
2007-04-04 Merge 1.5.0.7 in
2007-03-30 Merge branch 'maint'
2007-03-28 Merge branch 'maint' to synchronize with 1.5.0.6
2007-03-26 Merge branch 'jc/fpl'
2007-03-25 Merge branch 'maint'
2007-03-25 Merge branch 'js/remote-show-push'
2007-03-25 Merge branch 'maint'
2007-03-24 Merge branch 'maint'
2007-03-22 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-22 Merge branch 'maint'
2007-03-21 index-pack: use hash_sha1_file()
2007-03-20 Merge git://git2.kernel.org/pub/scm/gitk/gitk
2007-03-19 Merge branch 'jb/gc'
2007-03-19 Merge branch 'fl/cvsserver'
2007-03-19 Limit the size of the new delta_base_cache
2007-03-19 Merge branch 'sp/run-command'
2007-03-18 Merge branch 'ar/diff'
2007-03-18 Merge 1.5.0.5 in from 'maint'
2007-03-17 Merge branch 'maint'
2007-03-17 [PATCH] clean up pack index handling a bit
2007-03-14 Merge GIT 1.5.0.4
2007-03-14 Merge branch 'jc/repack'
2007-03-14 Merge branch 'jc/fetch'
2007-03-14 Merge branch 'dz/mailinfo'
2007-03-14 Merge branch 'jb/per-user-exclude'
2007-03-14 Merge branch 'maint'
2007-03-14 Merge branch 'pb/branch-track'
2007-03-13 Correct new compiler warnings in builtin-revert
2007-03-13 Merge branch 'master' of git://repo.or.cz/git-gui
2007-03-13 Merge branch 'maint'
2007-03-12 Merge branch 'maint'
2007-03-12 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2007-03-12 Merge branch 'maint'
2007-03-12 Merge branch 'jc/boundary'
2007-03-11 prepare_packed_git(): sort packs by age and localness.
2007-03-11 git-branch, git-checkout: autosetup for remote branch...
2007-03-11 Merge branch 'js/attach'
2007-03-11 Merge branch 'js/diff-ni'
2007-03-11 Merge branch 'jc/fsck'
2007-03-11 Merge branch 'js/revert-cherry'
2007-03-11 Merge branch 'sp/make'
2007-03-11 Merge branch 'maint'
2007-03-08 Merge branch 'js/config-rename'
2007-03-08 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-03-07 Merge branch 'maint'
2007-03-07 Use off_t when we really mean a file offset.
2007-03-07 Use uint32_t for all packed object counts.
2007-03-07 General const correctness fixes
2007-03-06 Merge branch 'maint'
2007-03-06 Merge branch 'master' of git://repo.or.cz/git-gui into...
2007-03-06 Merge branch 'maint'
2007-03-06 Merge branch 'master-for-junio' of git://repo.or.cz...
2007-03-05 Merge branch 'maint'
2007-03-05 unpack_sha1_file(): detect corrupt loose object files.
2007-03-05 Merge branch 'js/fetch-progress' (early part)
2007-03-05 Merge branch 'js/symlink'
2007-03-05 Merge branch 'maint'
2007-03-04 Merge branch 'js/diff-ni' (early part)
2007-03-04 Merge branch 'maint'
2007-03-03 Add core.symlinks to mark filesystems that do not suppo...
2007-03-03 Merge branch 'maint'
2007-03-02 Merge branch 'js/commit-format'
2007-03-02 Merge branch 'maint'
2007-02-28 Merge branch 'js/commit-by-name'
2007-02-28 Merge branch 'js/bundle'
2007-02-28 Merge branch 'maint'
2007-02-28 index_fd(): pass optional path parameter as hint for...
2007-02-28 index_fd(): use enum object_type instead of type name...
2007-02-28 Merge branch 'np/types'
2007-02-28 Merge branch 'mc/sendmail'
2007-02-28 Merge branch 'maint'
2007-02-28 make sure enum object_type is signed
2007-02-28 show_date(): rename the "relative" parameter to "mode"
2007-02-27 Merge branch 'np/types' into jc/fetch
2007-02-27 convert object type handling from a string to a number
2007-02-27 Merge branch 'maint'
2007-02-26 Merge branch 'master' into js/diff-ni
2007-02-26 Merge branch 'maint'
2007-02-26 Merge branch 'maint'
2007-02-26 Merge branch 'jc/merge-symlink' into maint
2007-02-25 Merge branch 'maint'
2007-02-25 Merge git://repo.or.cz/git-gui into maint
2007-02-24 Evil Merge branch 'jc/status' (early part) into js...
2007-02-24 Merge branch 'js/apply'
next