t5615: avoid re-using descriptor 4
[git] / merge.c
2017-12-06  Junio C HamanoMerge branch 'jc/merge-base-fork-point-doc' into maint
2017-12-06  Junio C HamanoMerge branch 'tz/notes-error-to-stderr' into maint
2017-12-06  Junio C HamanoMerge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-12-06  Junio C HamanoMerge branch 'sw/pull-ipv46-passthru' into maint
2017-11-27  Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-27  Junio C HamanoMerge branch 'rs/imap-send-next-arg-fix' into maint
2017-11-21  Junio C HamanoMerge branch 'cb/t4201-robustify' into maint
2017-11-21  Junio C HamanoMerge branch 'ad/rebase-i-serie-typofix' into maint
2017-11-21  Junio C HamanoMerge branch 'ab/pcre-v2' into maint
2017-11-15  Junio C HamanoMerge branch 'dk/libsecret-unlock-to-load-fix' into...
2017-11-15  Junio C HamanoMerge branch 'js/early-config' into maint
2017-11-15  Junio C HamanoMerge branch 'ao/diff-populate-filespec-lstat-errorpath...
2017-11-15  Junio C HamanoMerge branch 'jc/check-ref-format-oor' into maint
2017-11-15  Junio C HamanoMerge branch 'jk/rebase-i-exec-gitdir-fix' into maint
2017-11-15  Junio C HamanoMerge branch 'js/submodule-in-excluded' into maint
2017-11-09  Junio C HamanoMerge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28  Junio C HamanoMerge branch 'sg/rev-list-doc-reorder-fix'
2017-10-28  Junio C HamanoMerge branch 'sb/rev-parse-show-superproject-root'
2017-10-28  Junio C HamanoMerge branch 'ao/path-use-xmalloc'
2017-10-23  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-23  Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix' into...
2017-10-23  Junio C HamanoMerge branch 'nd/worktree-kill-parse-ref' into maint
2017-10-19  Junio C HamanoMerge branch 'jc/fetch-refspec-doc-update'
2017-10-18  Junio C HamanoMerge branch 'rs/qsort-s' into maint
2017-10-18  Junio C HamanoMerge branch 'mr/doc-negative-pathspec' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix...
2017-10-18  Junio C HamanoMerge branch 'jk/system-path-cleanup' into maint
2017-10-18  Junio C HamanoMerge branch 'ma/pkt-line-leakfix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/config-lockfile-leak-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos' into maint
2017-10-18  Junio C HamanoMerge branch 'rb/compat-poll-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'ar/request-pull-phrasofix' into maint
2017-10-18  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix' into maint
2017-10-18  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix' into...
2017-10-18  Junio C HamanoMerge branch 'jk/diff-blob' into maint
2017-10-18  Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into maint
2017-10-18  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix' into maint
2017-10-18  Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix' into maint
2017-10-07  Junio C HamanoMerge branch 'rb/compat-poll-fix'
2017-10-07  Junio C HamanoMerge branch 'rs/qsort-s'
2017-10-05  Junio C HamanoMerge branch 'ar/request-pull-phrasofix'
2017-10-03  Junio C HamanoMerge branch 'mr/doc-negative-pathspec'
2017-09-29  Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix'
2017-09-28  Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28  Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28  Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28  Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix'
2017-09-28  Junio C HamanoMerge branch 'jk/diff-blob'
2017-09-28  Junio C HamanoMerge branch 'jk/describe-omit-some-refs'
2017-09-25  Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-22  Junio C HamanoSync with 2.13.6
2017-09-22  Junio C HamanoSync with 2.11.4
2017-09-22  Junio C HamanoSync with 2.10.5
2017-09-20  Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20  Junio C HamanoMerge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19  Junio C HamanoMerge branch 'jk/system-path-cleanup'
2017-09-19  Junio C HamanoMerge branch 'ma/pkt-line-leakfix'
2017-09-19  Junio C HamanoMerge branch 'jk/config-lockfile-leak-fix'
2017-09-10  Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos'
2017-09-10  Junio C HamanoMerge branch 'nd/worktree-kill-parse-ref'
2017-09-10  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'jk/doc-the-this' into maint
2017-09-10  Junio C HamanoMerge branch 'sb/submodule-parallel-update' into maint
2017-09-10  Junio C HamanoMerge branch 'hv/t5526-andand-chain-fix' into maint
2017-09-10  Junio C HamanoMerge branch 'sb/sha1-file-cleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10  Junio C HamanoMerge branch 'ah/doc-empty-string-is-false' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/merge-microcleanup' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/apply-lose-prefix-length' into maint
2017-09-10  Junio C HamanoMerge branch 'rj/add-chmod-error-message' into maint
2017-09-10  Junio C HamanoMerge branch 'jk/hashcmp-memcmp' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/t3700-clean-leftover' into maint
2017-09-10  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10  Junio C HamanoMerge branch 'ab/ref-filter-no-contains' into maint
2017-09-10  Junio C HamanoMerge branch 'as/grep-quiet-no-match-exit-code-fix...
2017-09-10  Junio C HamanoMerge branch 'rs/win32-syslog-leakfix' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/unpack-entry-leakfix' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/fsck-obj-leakfix' into maint
2017-09-10  Junio C HamanoMerge branch 'ur/svn-local-zone' into maint
2017-09-10  Junio C HamanoMerge branch 'pw/am-signoff' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/in-obsd-basename-dirname-take-const...
2017-09-10  Junio C HamanoMerge branch 'rs/t4062-obsd' into maint
2017-09-10  Junio C HamanoMerge branch 'rs/obsd-getcwd-workaround' into maint
2017-09-10  Junio C HamanoMerge branch 'bw/clone-recursive-quiet' into maint
2017-09-10  Junio C HamanoMerge branch 'bw/push-options-recursively-to-submodules...
2017-09-10  Junio C HamanoMerge branch 'st/lib-gpg-kill-stray-agent' into maint
2017-08-27  Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
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 'jk/trailers-parse'
2017-08-24  Junio C HamanoMerge branch 'jk/doc-the-this'
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
next