sha1_file: do not leak `lock_file`
[git/git.git] / merge.c
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
2017-08-23 Junio C HamanoMerge branch 'rs/stat-data-unaligned-reads-fix' into...
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 'jc/http-sslkey-and-ssl-cert-are-paths...
2017-08-23 Junio C HamanoMerge branch 'sb/submodule-parallel-update'
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 'ah/doc-empty-string-is-false'
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 'ma/parse-maybe-bool'
2017-08-22 Junio C HamanoMerge branch 'ab/ref-filter-no-contains'
2017-08-22 Junio C HamanoMerge branch 'bw/clone-recursive-quiet'
2017-08-22 Junio C HamanoMerge branch 'bw/push-options-recursively-to-submodules'
2017-08-11 Junio C HamanoMerge branch 'dl/credential-cache-socket-in-xdg-cache'
2017-08-11 Junio C HamanoMerge branch 'dc/fmt-merge-msg-microcleanup'
2017-08-11 Junio C HamanoMerge branch 'ah/doc-wserrorhighlight'
2017-08-11 Junio C HamanoMerge branch 'cc/ref-is-hidden-microcleanup'
2017-08-11 Junio C HamanoMerge branch 'js/run-process-parallel-api-fix'
2017-08-11 Junio C HamanoMerge branch 'hb/gitweb-project-list'
2017-08-11 Junio C HamanoMerge branch 'ks/commit-abort-on-empty-message-fix'
2017-08-11 Junio C HamanoMerge branch 'st/lib-gpg-kill-stray-agent'
2017-08-11 Junio C HamanoMerge branch 'rs/pack-objects-pbase-cleanup'
next