Merge branch 'ab/c-translators-comment-style' into maint
[git] / builtin / merge-index.c
2017-06-05  Junio C HamanoMerge branch 'ls/travis-doc-asciidoctor' into maint
2017-06-04  Junio C HamanoMerge branch 'tg/stash-push-fixup' into maint
2017-06-04  Junio C HamanoMerge branch 'km/log-showsignature-doc' into maint
2017-06-04  Junio C HamanoMerge branch 'jt/use-trailer-api-in-commands' into...
2017-06-04  Junio C HamanoMerge branch 'jt/push-options-doc' into maint
2017-06-04  Junio C HamanoMerge branch 'jk/update-links-in-docs' into maint
2017-06-04  Junio C HamanoMerge branch 'jk/ignore-broken-tags-when-ignoring-missi...
2017-06-04  Junio C HamanoMerge branch 'jk/disable-pack-reuse-when-broken' into...
2017-06-04  Junio C HamanoMerge branch 'jk/am-leakfix' into maint
2017-06-04  Junio C HamanoMerge branch 'jc/read-tree-empty-with-m' into maint
2017-06-04  Junio C HamanoMerge branch 'jc/apply-fix-mismerge' into maint
2017-06-04  Junio C HamanoMerge branch 'ja/do-not-ask-needless-questions' into...
2017-06-04  Junio C HamanoMerge branch 'bw/submodule-with-bs-path' into maint
2017-06-04  Junio C HamanoMerge branch 'ah/log-decorate-default-to-auto' into...
2017-06-04  Junio C HamanoMerge branch 'ab/aix-needs-compat-regex' into maint
2017-06-04  Junio C HamanoMerge branch 'pw/rebase-i-regression-fix' into maint
2017-05-09  Junio C HamanoSync with v2.12.3
2017-05-09  Junio C HamanoMerge branch 'jh/verify-index-checksum-only-in-fsck'
2017-05-05  Junio C HamanoMerge branch 'maint-2.11' into maint
2017-05-05  Junio C HamanoMerge branch 'maint-2.10' into maint-2.11
2017-05-05  Junio C HamanoMerge branch 'maint-2.6' into maint-2.7
2017-05-04  Junio C HamanoMerge branch 'sr/hooks-cwd-doc'
2017-05-04  Junio C HamanoMerge branch 'rg/doc-submittingpatches-wordfix'
2017-05-04  Junio C HamanoMerge branch 'rg/doc-pull-typofix'
2017-05-01  Junio C HamanoMerge branch 'jk/submodule-init-segv-fix'
2017-05-01  Junio C HamanoMerge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-26  Junio C HamanoMerge branch 'mh/separate-ref-cache'
2017-04-26  Junio C HamanoMerge branch 'nd/worktree-add-lock'
2017-04-26  Junio C HamanoMerge branch 'jk/update-links-in-docs'
2017-04-26  Junio C HamanoMerge branch 'sf/putty-w-args'
2017-04-26  Junio C HamanoMerge branch 'ab/completion-push-delete-ref'
2017-04-26  Junio C HamanoMerge branch 'cc/split-index-config'
2017-04-26  Junio C HamanoMerge branch 'jk/war-on-git-path'
2017-04-26  Junio C HamanoMerge branch 'jh/add-index-entry-optim'
2017-04-26  Junio C HamanoMerge branch 'ss/submodule-shallow-doc'
2017-04-26  Junio C HamanoMerge branch 'ss/gitmodules-ignore-doc'
2017-04-26  Junio C HamanoMerge branch 'nd/conditional-config-in-early-config'
2017-04-26  Junio C HamanoMerge branch 'ab/push-cas-doc-n-test'
2017-04-26  Junio C HamanoMerge branch 'ls/travis-coccicheck'
2017-04-26  Junio C HamanoMerge branch 'ps/pathspec-empty-prefix-origin'
2017-04-26  Junio C HamanoMerge branch 'pc/t2027-git-to-pipe-cleanup'
2017-04-26  Junio C HamanoMerge branch 'gb/rebase-signoff'
2017-04-24  Junio C HamanoMerge branch 'dt/xgethostname-nul-termination'
2017-04-24  Junio C HamanoMerge branch 'jk/ls-files-recurse-submodules-fix'
2017-04-24  Junio C HamanoMerge branch 'rs/misc-cppcheck-fixes'
2017-04-24  Junio C HamanoMerge branch 'jk/snprintf-cleanups'
2017-04-24  Junio C HamanoMerge branch 'xy/format-patch-base'
2017-04-24  Junio C HamanoMerge branch 'sb/checkout-recurse-submodules'
2017-04-24  Junio C HamanoMerge branch 'jt/fetch-pack-error-reporting'
2017-04-24  Junio C HamanoMerge branch 'km/t1400-modernization'
2017-04-24  Junio C HamanoMerge branch 'jk/quarantine-received-objects'
2017-04-24  Junio C HamanoMerge branch 'jk/loose-object-fsck'
2017-04-24  Junio C HamanoMerge branch 'bw/submodule-with-bs-path'
2017-04-24  Junio C HamanoMerge branch 'jh/verify-index-checksum-only-in-fsck'
2017-04-24  Junio C HamanoMerge branch 'jh/unpack-trees-micro-optim'
2017-04-24  Junio C HamanoMerge branch 'jh/string-list-micro-optim'
2017-04-24  Junio C HamanoMerge branch 'nd/conditional-config-include'
2017-04-24  Junio C HamanoMerge branch 'dt/http-postbuffer-can-be-large'
2017-04-24  Junio C HamanoMerge branch 'tb/doc-eol-normalization'
2017-04-24  Junio C HamanoMerge branch 'sr/http-proxy-configuration-fix'
2017-04-20  Junio C HamanoMerge branch 'jh/memihash-opt'
2017-04-20  Junio C HamanoMerge branch 'vn/revision-shorthand-for-side-branch...
2017-04-20  Junio C HamanoMerge branch 'sf/putty-w-args'
2017-04-20  Junio C HamanoMerge branch 'ld/p4-current-branch-fix'
2017-04-20  Junio C HamanoMerge branch 'dt/gc-ignore-old-gc-logs'
2017-04-20  Junio C HamanoMerge branch 'bw/attr-pathspec'
2017-04-20  Junio C HamanoMerge branch 'ab/grep-plug-pathspec-leak'
2017-04-20  Junio C HamanoMerge branch 'jk/no-looking-at-dotgit-outside-repo'
2017-04-20  Junio C HamanoMerge branch 'nd/files-backend-git-dir'
2017-04-20  Junio C HamanoMerge branch 'bw/submodule-is-active'
2017-04-20  Junio C HamanoMerge branch 'va/i18n-perl-scripts'
2017-04-20  Junio C HamanoMerge branch 'sb/submodule-rm-absorb'
2017-04-20  Junio C HamanoMerge branch 'ah/diff-files-ours-theirs-doc'
2017-04-20  Junio C HamanoMerge branch 'lt/mailinfo-in-body-header-continuation'
2017-04-20  Junio C HamanoMerge branch 'bw/push-options-recursively-to-submodules'
2017-04-20  Junio C HamanoMerge branch 'bc/object-id'
2017-04-17  Junio C HamanoMerge branch 'js/difftool-builtin'
2017-04-17  Junio C HamanoMerge branch 'ab/regen-perl-mak-with-different-perl'
2017-04-17  Junio C HamanoMerge branch 'sb/show-diff-for-submodule-in-diff-fix'
2017-04-17  Junio C HamanoMerge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-04-17  Junio C HamanoMerge branch 'jc/unused-symbols'
2017-04-11  Junio C HamanoMerge branch 'cc/untracked'
2017-03-30  Junio C HamanoMerge branch 'jk/make-coccicheck-detect-errors'
2017-03-30  Junio C HamanoMerge branch 'bc/push-cert-receive-fix'
2017-03-30  Junio C HamanoMerge branch 'jk/no-looking-at-dotgit-outside-repo...
2017-03-30  Junio C HamanoMerge branch 'jc/merge-drop-old-syntax'
2017-03-28  Junio C HamanoMerge branch 'jh/memihash-opt'
2017-03-28  Junio C HamanoMerge branch 'sg/skip-prefix-in-prettify-refname'
2017-03-28  Junio C HamanoMerge branch 'tg/stash-push-fixup'
2017-03-28  Junio C HamanoMerge branch 'bw/grep-recurse-submodules'
2017-03-28  Junio C HamanoMerge branch 'km/config-grammofix' into maint
2017-03-28  Junio C HamanoMerge branch 'sb/submodule-update-initial-runs-custom...
2017-03-28  Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2017-03-28  Junio C HamanoMerge branch 'rs/update-hook-optim' into maint
2017-03-28  Junio C HamanoMerge branch 'rs/path-name-safety-cleanup' into maint
2017-03-28  Junio C HamanoMerge branch 'rs/http-push-cleanup' into maint
2017-03-28  Junio C HamanoMerge branch 'rs/blame-code-cleanup' into maint
2017-03-28  Junio C HamanoMerge branch 'st/verify-tag' into maint
2017-03-28  Junio C HamanoMerge branch 'js/regexec-buf' into maint
2017-03-28  Junio C HamanoMerge branch 'jk/execv-dashed-external' into maint
next