Andrew's git / gitweb.git / history
?
read-cache: fix index corruption with index v4
[gitweb.git] / builtin / merge-index.c
2017-06-04 Merge branch 'jc/read-tree-empty-with-m' into maint blob | diff | raw
2017-06-04 Merge branch 'jc/apply-fix-mismerge' into maint blob | diff | raw
2017-06-04 Merge branch 'ja/do-not-ask-needless-questions' into... blob | diff | raw
2017-06-04 Merge branch 'bw/submodule-with-bs-path' into maint blob | diff | raw
2017-06-04 Merge branch 'ah/log-decorate-default-to-auto' into... blob | diff | raw
2017-06-04 Merge branch 'ab/aix-needs-compat-regex' into maint blob | diff | raw
2017-06-04 Merge branch 'pw/rebase-i-regression-fix' into maint blob | diff | raw
2017-06-04 Merge branch 'ab/t3070-test-dedup' blob | diff | raw
2017-06-04 Merge branch 'ah/doc-filter-branch-export-env' blob | diff | raw
2017-06-04 Merge branch 'sd/t3200-typofix' blob | diff | raw
2017-06-02 Merge branch 'sl/clean-d-ignored-fix' blob | diff | raw
2017-06-02 Merge branch 'sb/t5531-update-desc' blob | diff | raw
2017-06-02 Merge branch 'ah/doc-pretty-format-fix' blob | diff | raw
2017-06-02 Merge branch 'ah/doc-interpret-trailers-ifexists' blob | diff | raw
2017-06-02 Merge branch 'ab/ref-filter-no-contains' blob | diff | raw
2017-06-02 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when... blob | diff | raw
2017-06-02 Merge branch 'js/bs-is-a-dir-sep-on-windows' blob | diff | raw
2017-05-30 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when... blob | diff | raw
2017-05-30 Merge branch 'jh/memihash-opt' blob | diff | raw
2017-05-30 Merge branch 'bp/sub-process-convert-filter' blob | diff | raw
2017-05-30 Merge branch 'bw/forking-and-threading' blob | diff | raw
2017-05-30 Merge branch 'jc/name-rev-lw-tag' blob | diff | raw
2017-05-29 Merge branch 'jk/ignore-broken-tags-when-ignoring-missi... blob | diff | raw
2017-05-29 Merge branch 'jk/alternate-ref-optim' blob | diff | raw
2017-05-29 Merge branch 'tg/stash-push-fixup' blob | diff | raw
2017-05-29 Merge branch 'pw/rebase-i-regression-fix' blob | diff | raw
2017-05-29 Merge branch 'kn/ref-filter-branch-list' blob | diff | raw
2017-05-29 Merge branch 'km/log-showsignature-doc' blob | diff | raw
2017-05-29 Merge branch 'jk/update-links-in-docs' blob | diff | raw
2017-05-29 Merge branch 'ja/do-not-ask-needless-questions' blob | diff | raw
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix' blob | diff | raw
2017-05-29 Merge branch 'jc/read-tree-empty-with-m' blob | diff | raw
2017-05-29 Merge branch 'jk/disable-pack-reuse-when-broken' blob | diff | raw
2017-05-29 Merge branch 'jk/diff-submodule-diff-inline' blob | diff | raw
2017-05-29 Merge branch 'jc/repack-threads' blob | diff | raw
2017-05-29 Merge branch 'sb/reset-recurse-submodules' blob | diff | raw
2017-05-23 Merge branch 'jt/push-options-doc' blob | diff | raw
2017-05-23 Merge branch 'rs/checkout-am-fix-unborn' blob | diff | raw
2017-05-23 Merge branch 'ls/travis-relays-for-windows-ci' blob | diff | raw
2017-05-23 Merge branch 'ah/log-decorate-default-to-auto' blob | diff | raw
2017-05-23 Merge branch 'bw/submodule-with-bs-path' blob | diff | raw
2017-05-16 Merge branch 'jc/apply-fix-mismerge' blob | diff | raw
2017-05-16 Merge branch 'ab/aix-needs-compat-regex' blob | diff | raw
2017-05-16 Merge branch 'jn/credential-doc-on-clear' blob | diff | raw
2017-05-16 Merge branch 'jn/clone-add-empty-config-from-command... blob | diff | raw
2017-05-16 Merge branch 'ls/travis-doc-asciidoctor' blob | diff | raw
2017-05-16 Merge branch 'rs/large-zip' blob | diff | raw
2017-05-16 Merge branch 'ab/clone-no-tags' blob | diff | raw
2017-05-16 Merge branch 'jk/am-leakfix' blob | diff | raw
2017-05-16 Merge branch 'jt/use-trailer-api-in-commands' blob | diff | raw
2017-05-16 Merge branch 'nd/worktree-kill-parse-ref' blob | diff | raw
2017-05-16 Merge branch 'dt/gc-ignore-old-gc-logs' blob | diff | raw
2017-05-16 Merge branch 'jk/no-null-sha1-in-cache-tree' blob | diff | raw
2017-05-09 Sync with v2.12.3 blob | diff | raw
2017-05-09 Merge branch 'jh/verify-index-checksum-only-in-fsck' blob | diff | raw
2017-05-05 Merge branch 'maint-2.11' into maint blob | diff | raw | diff to current
2017-05-05 Merge branch 'maint-2.10' into maint-2.11 blob | diff | raw | diff to current
2017-05-05 Merge branch 'maint-2.6' into maint-2.7 blob | diff | raw | diff to current
2017-05-04 Merge branch 'sr/hooks-cwd-doc' blob | diff | raw
2017-05-04 Merge branch 'rg/doc-submittingpatches-wordfix' blob | diff | raw
2017-05-04 Merge branch 'rg/doc-pull-typofix' blob | diff | raw
2017-05-01 Merge branch 'jk/submodule-init-segv-fix' blob | diff | raw
2017-05-01 Merge branch 'jk/prio-queue-avoid-swap-with-self' blob | diff | raw
2017-04-26 Merge branch 'mh/separate-ref-cache' blob | diff | raw
2017-04-26 Merge branch 'nd/worktree-add-lock' blob | diff | raw
2017-04-26 Merge branch 'jk/update-links-in-docs' blob | diff | raw
2017-04-26 Merge branch 'sf/putty-w-args' blob | diff | raw
2017-04-26 Merge branch 'ab/completion-push-delete-ref' blob | diff | raw
2017-04-26 Merge branch 'cc/split-index-config' blob | diff | raw
2017-04-26 Merge branch 'jk/war-on-git-path' blob | diff | raw
2017-04-26 Merge branch 'jh/add-index-entry-optim' blob | diff | raw
2017-04-26 Merge branch 'ss/submodule-shallow-doc' blob | diff | raw
2017-04-26 Merge branch 'ss/gitmodules-ignore-doc' blob | diff | raw
2017-04-26 Merge branch 'nd/conditional-config-in-early-config' blob | diff | raw
2017-04-26 Merge branch 'ab/push-cas-doc-n-test' blob | diff | raw
2017-04-26 Merge branch 'ls/travis-coccicheck' blob | diff | raw
2017-04-26 Merge branch 'ps/pathspec-empty-prefix-origin' blob | diff | raw
2017-04-26 Merge branch 'pc/t2027-git-to-pipe-cleanup' blob | diff | raw
2017-04-26 Merge branch 'gb/rebase-signoff' blob | diff | raw
2017-04-24 Merge branch 'dt/xgethostname-nul-termination' blob | diff | raw
2017-04-24 Merge branch 'jk/ls-files-recurse-submodules-fix' blob | diff | raw
2017-04-24 Merge branch 'rs/misc-cppcheck-fixes' blob | diff | raw
2017-04-24 Merge branch 'jk/snprintf-cleanups' blob | diff | raw
2017-04-24 Merge branch 'xy/format-patch-base' blob | diff | raw
2017-04-24 Merge branch 'sb/checkout-recurse-submodules' blob | diff | raw
2017-04-24 Merge branch 'jt/fetch-pack-error-reporting' blob | diff | raw
2017-04-24 Merge branch 'km/t1400-modernization' blob | diff | raw
2017-04-24 Merge branch 'jk/quarantine-received-objects' blob | diff | raw
2017-04-24 Merge branch 'jk/loose-object-fsck' blob | diff | raw
2017-04-24 Merge branch 'bw/submodule-with-bs-path' blob | diff | raw
2017-04-24 Merge branch 'jh/verify-index-checksum-only-in-fsck' blob | diff | raw
2017-04-24 Merge branch 'jh/unpack-trees-micro-optim' blob | diff | raw
2017-04-24 Merge branch 'jh/string-list-micro-optim' blob | diff | raw
2017-04-24 Merge branch 'nd/conditional-config-include' blob | diff | raw
2017-04-24 Merge branch 'dt/http-postbuffer-can-be-large' blob | diff | raw
2017-04-24 Merge branch 'tb/doc-eol-normalization' blob | diff | raw
2017-04-24 Merge branch 'sr/http-proxy-configuration-fix' blob | diff | raw
2017-04-20 Merge branch 'jh/memihash-opt' blob | diff | raw
2017-04-20 Merge branch 'vn/revision-shorthand-for-side-branch... blob | diff | raw
2017-04-20 Merge branch 'sf/putty-w-args' blob | diff | raw
next