t1404: add a bunch of tests of D/F conflicts
[git] / cache.h
2017-08-27  Junio C HamanoMerge branch 'mg/killed-merge'
2017-08-27  Junio C HamanoMerge branch 'jt/packmigrate'
2017-08-27  Junio C HamanoMerge branch 'mh/ref-lock-entry'
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27  Junio C HamanoMerge branch 'jc/cutoff-config'
2017-08-27  Junio C HamanoMerge branch 'kw/write-index-reduce-alloc'
2017-08-27  Junio C HamanoMerge branch 'bw/submodule-config-cleanup'
2017-08-27  Junio C HamanoMerge branch 'js/gitweb-raw-blob-link-in-history'
2017-08-27  Junio C HamanoMerge branch 'po/object-id'
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'tb/apply-with-crlf'
2017-08-27  Junio C HamanoMerge branch 'jt/stash-tests'
2017-08-27  Junio C HamanoMerge branch 'jk/trailers-parse'
2017-08-27  Junio C HamanoMerge branch 'pb/trailers-from-command-line'
2017-08-27  Junio C HamanoMerge branch 'jt/diff-color-move-fix'
2017-08-27  Junio C HamanoMerge branch 'sb/diff-color-move'
2017-08-24  Junio C HamanoMerge branch 'jk/doc-the-this'
2017-08-24  Junio C HamanoMerge branch 'rs/commit-h-single-parent-cleanup'
2017-08-24  Junio C HamanoMerge branch 'jc/simplify-progress'
2017-08-24  Junio C HamanoMerge branch 'tc/curl-with-backports'
2017-08-24  Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilities'
2017-08-24  Junio C HamanoMerge branch 'rs/object-id'
2017-08-24  Junio C HamanoMerge branch 'lg/merge-signoff'
2017-08-23  Jonathan Tanpack: move for_each_packed_object()
2017-08-23  Jonathan Tanpack: move has_pack_index()
2017-08-23  Jonathan Tanpack: move has_sha1_pack()
2017-08-23  Jonathan Tanpack: move find_sha1_pack()
2017-08-23  Jonathan Tanpack: move find_pack_entry_one(), is_pack_valid()
2017-08-23  Jonathan Tanpack: move check_pack_index_ptr(), nth_packed_object_of...
2017-08-23  Jonathan Tanpack: move nth_packed_object_{sha1,oid}
2017-08-23  Jonathan Tanpack: move clear_delta_base_cache(), packed_object_info...
2017-08-23  Jonathan Tanpack: move unpack_object_header()
2017-08-23  Jonathan Tanpack: move get_size_from_delta()
2017-08-23  Jonathan Tanpack: move unpack_object_header_buffer()
2017-08-23  Jonathan Tanpack: move {,re}prepare_packed_git and approximate_obje...
2017-08-23  Jonathan Tanpack: move install_packed_git()
2017-08-23  Jonathan Tanpack: move add_packed_git()
2017-08-23  Jonathan Tanpack: move unuse_pack()
2017-08-23  Jonathan Tanpack: move use_pack()
2017-08-23  Jonathan Tanpack: move pack-closing functions
2017-08-23  Jonathan Tanpack: move open_pack_index(), parse_pack_index()
2017-08-23  Jonathan Tanpack: move pack_report()
2017-08-23  Jonathan Tanpack: move pack name-related functions
2017-08-23  Junio C HamanoSync with maint
2017-08-23  Junio C HamanoMerge branch 'jt/t1450-fsck-corrupt-packfile' into...
2017-08-23  Junio C HamanoMerge branch 'jb/t8008-cleanup' into maint
2017-08-23  Junio C HamanoMerge branch 'jt/subprocess-handshake' into maint
2017-08-23  Junio C HamanoMerge branch 'dc/fmt-merge-msg-microcleanup' into maint
2017-08-23  Junio C HamanoMerge branch 'ah/doc-wserrorhighlight' into maint
2017-08-23  Junio C HamanoMerge branch 'cc/ref-is-hidden-microcleanup' into maint
2017-08-23  Junio C HamanoMerge branch 'js/run-process-parallel-api-fix' into...
2017-08-23  Junio C HamanoMerge branch 'rs/pack-objects-pbase-cleanup' into maint
2017-08-23  Junio C HamanoMerge branch 'jt/fsck-code-cleanup' into maint
2017-08-23  Junio C HamanoMerge branch 'rs/stat-data-unaligned-reads-fix' into...
2017-08-23  Junio C HamanoMerge branch 'rs/move-array' into maint
2017-08-23  Junio C HamanoMerge branch 'rs/bswap-ubsan-fix' into maint
2017-08-23  Junio C HamanoMerge branch 'dl/credential-cache-socket-in-xdg-cache...
2017-08-23  Junio C HamanoMerge branch 'hb/gitweb-project-list' into maint
2017-08-23  Junio C HamanoMerge branch 'ks/commit-abort-on-empty-message-fix...
2017-08-23  Junio C HamanoMerge branch 'jk/reflog-walk' into maint
2017-08-23  Junio C HamanoMerge branch 'jc/http-sslkey-and-ssl-cert-are-paths...
2017-08-23  Junio C HamanoMerge branch 'jk/ref-filter-colors' into maint
2017-08-23  Junio C HamanoMerge branch 'js/git-gui-msgfmt-on-windows' into maint
2017-08-23  Junio C HamanoMerge branch 'mg/format-ref-doc-fix'
2017-08-23  Junio C HamanoMerge branch 'sb/submodule-parallel-update'
2017-08-23  Junio C HamanoMerge branch 'jc/diff-sane-truncate-no-more'
2017-08-23  Junio C HamanoMerge branch 'hv/t5526-andand-chain-fix'
2017-08-23  Junio C HamanoMerge branch 'as/grep-quiet-no-match-exit-code-fix'
2017-08-23  Junio C HamanoMerge branch 'kw/commit-keep-index-when-pre-commit...
2017-08-23  Junio C HamanoMerge branch 'sb/sha1-file-cleanup'
2017-08-23  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-23  Junio C HamanoMerge branch 'kd/stash-with-bash-4.4'
2017-08-23  Junio C HamanoMerge branch 'ah/doc-empty-string-is-false'
2017-08-23  Junio C HamanoMerge branch 'kw/rebase-progress'
2017-08-23  Junio C HamanoMerge branch 'ks/prepare-commit-msg-sample-fix'
2017-08-23  Junio C HamanoMerge branch 'nm/stash-untracked'
2017-08-23  Junio C HamanoMerge branch 'jt/sha1-file-cleanup'
2017-08-22  Junio C HamanoMerge branch 'mh/packed-ref-store'
2017-08-22  Junio C HamanoMerge branch 'sb/retire-t1200'
2017-08-22  Junio C HamanoMerge branch 'rs/win32-syslog-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/unpack-entry-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix'
2017-08-22  Junio C HamanoMerge branch 'rs/merge-microcleanup'
2017-08-22  Junio C HamanoMerge branch 'rs/fsck-obj-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22  Junio C HamanoMerge branch 'rs/apply-lose-prefix-length'
2017-08-22  Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22  Junio C HamanoMerge branch 'jk/hashcmp-memcmp'
2017-08-22  Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos'
2017-08-22  Junio C HamanoMerge branch 'ur/svn-local-zone'
2017-08-22  Junio C HamanoMerge branch 'pw/am-signoff'
2017-08-22  Junio C HamanoMerge branch 'rs/t3700-clean-leftover'
2017-08-22  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-22  Junio C HamanoMerge branch 'rs/in-obsd-basename-dirname-take-const'
2017-08-22  Junio C HamanoMerge branch 'rs/obsd-getcwd-workaround'
2017-08-22  Junio C HamanoMerge branch 'mf/no-dashed-subcommands'
2017-08-22  Junio C HamanoMerge branch 'ma/parse-maybe-bool'
2017-08-22  Junio C HamanoMerge branch 'ab/ref-filter-no-contains'
next