]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c
merge-recursive: fix rename/rename(1to2) for working tree with a binary
[thirdparty/git.git] / merge-recursive.c
2020-05-14  Elijah Newrenmerge-recursive: fix rename/rename(1to2) for working...
2020-05-13  Junio C HamanoMerge branch 'cc/upload-pack-v2-fetch-fix'
2020-05-13  Junio C HamanoMerge branch 'ds/sparse-updates-oob-access-fix'
2020-05-13  Junio C HamanoMerge branch 'jc/auto-gc-quiet'
2020-05-13  Junio C HamanoMerge branch 'cb/credential-doc-fixes'
2020-05-13  Junio C HamanoMerge branch 'tb/shallow-cleanup'
2020-05-08  Junio C HamanoMerge branch 'cb/t0000-use-the-configured-shell'
2020-05-08  Junio C HamanoMerge branch 'bc/doc-credential-helper-value'
2020-05-08  Junio C HamanoMerge branch 'cb/avoid-colliding-with-netbsd-hmac'
2020-05-08  Junio C HamanoMerge branch 'es/restore-staged-from-head-by-default'
2020-05-08  Junio C HamanoMerge branch 'jk/arith-expansion-coding-guidelines'
2020-05-08  Junio C HamanoMerge branch 'ds/sparse-allow-empty-working-tree'
2020-05-08  Junio C HamanoMerge branch 'jk/for-each-ref-multi-key-sort-fix'
2020-05-08  Junio C HamanoMerge branch 'jk/credential-sample-update'
2020-05-08  Junio C HamanoMerge branch 'cb/credential-store-ignore-bogus-lines'
2020-05-08  Junio C HamanoMerge branch 'dl/switch-c-option-in-error-message'
2020-05-05  Junio C HamanoMerge branch 'js/partial-urlmatch'
2020-05-05  Junio C HamanoMerge branch 'js/partial-urlmatch-2.17'
2020-05-05  Junio C HamanoMerge branch 'dl/push-recurse-submodules-fix'
2020-05-05  Junio C HamanoMerge branch 'bc/wildcard-credential'
2020-05-01  Junio C HamanoMerge branch 'jt/v2-fetch-nego-fix'
2020-05-01  Junio C HamanoMerge branch 'js/anonymise-push-url-in-errors'
2020-05-01  Junio C HamanoMerge branch 'es/bugreport'
2020-05-01  Junio C HamanoMerge branch 'en/rebase-root-and-fork-point-are-incompa...
2020-05-01  Junio C HamanoMerge branch 'ds/build-homebrew-gettext-fix'
2020-05-01  Junio C HamanoMerge branch 'mt/doc-worktree-ref'
2020-05-01  Junio C HamanoMerge branch 'eb/gitweb-more-trailers'
2020-05-01  Junio C HamanoMerge branch 'ds/multi-pack-index'
2020-05-01  Junio C HamanoMerge branch 'tb/commit-graph-fd-exhaustion-fix'
2020-05-01  Junio C HamanoMerge branch 'tb/commit-graph-split-strategy'
2020-05-01  Junio C HamanoMerge branch 'tb/reset-shallow'
2020-05-01  Junio C HamanoMerge branch 'dd/mailinfo-with-nul'
2020-05-01  Junio C HamanoMerge branch 'jk/build-with-right-curl'
2020-04-29  Junio C HamanoMerge branch 'en/fill-directory-exponential'
2020-04-29  Junio C HamanoMerge branch 'en/sparse-checkout'
2020-04-29  Junio C HamanoMerge branch 'dd/ci-musl-libc'
2020-04-29  Junio C HamanoMerge branch 'dl/merge-autostash-rebase-quit-fix'
2020-04-29  Junio C HamanoMerge branch 'dl/merge-autostash'
2020-04-29  Junio C HamanoSync with js/partial-urlmatch-2.17
2020-04-28  Junio C HamanoMerge branch 'jn/demote-proto2-from-default'
2020-04-28  Junio C HamanoMerge branch 'jc/gnu-hurd-lets-fread-read-dirs'
2020-04-28  Junio C HamanoMerge branch 'ms/doc-revision-illustration-fix'
2020-04-28  Junio C HamanoMerge branch 'tm/zsh-complete-switch-restore'
2020-04-28  Junio C HamanoMerge branch 'mt/grep-cquote-path'
2020-04-28  Junio C HamanoMerge branch 'vd/range-diff-with-custom-pretty-format...
2020-04-28  Junio C HamanoMerge branch 'tb/diff-tree-with-notes'
2020-04-28  Junio C HamanoMerge branch 'eb/mboxrd-doc'
2020-04-28  Junio C HamanoMerge branch 'js/stash-p-fix'
2020-04-28  Junio C HamanoMerge branch 'dl/libify-a-few'
2020-04-28  Junio C HamanoMerge branch 'jx/atomic-push'
2020-04-28  Junio C HamanoMerge branch 'jt/avoid-prefetch-when-able-in-diff'
2020-04-28  Junio C HamanoMerge branch 'js/subtree-doc-update-to-asciidoctor-2'
2020-04-28  Junio C HamanoMerge branch 'ds/t5319-touch-fix'
2020-04-28  Junio C HamanoMerge branch 'ds/commit-graph-expiry-fix'
2020-04-28  Junio C HamanoMerge branch 'jc/log-no-mailmap'
2020-04-28  Junio C HamanoMerge branch 'ma/doc-discard-docbook-xsl-1.73'
2020-04-28  Junio C HamanoMerge branch 'lx/submodule-clear-variables'
2020-04-28  Junio C HamanoMerge branch 'jk/fast-import-use-hashmap'
2020-04-28  Junio C HamanoMerge branch 'bc/constant-memequal'
2020-04-28  Junio C HamanoMerge branch 'lr/freshen-file-fix'
2020-04-28  Junio C HamanoMerge branch 'jc/doc-test-leaving-early'
2020-04-28  Junio C HamanoMerge branch 'dd/test-with-busybox'
2020-04-22  Junio C HamanoMerge branch 'jk/credential-parsing-end-of-host-in...
2020-04-22  Junio C HamanoMerge branch 'jt/rebase-allow-duplicate'
2020-04-22  Junio C HamanoMerge branch 'en/rebase-no-keep-empty'
2020-04-22  Junio C HamanoMerge branch 'js/mingw-fixes'
2020-04-22  Junio C HamanoMerge branch 'jc/missing-ref-store-fix'
2020-04-22  Junio C HamanoMerge branch 'ma/config-doc-fix'
2020-04-22  Junio C HamanoMerge branch 'pb/pull-fetch-doc'
2020-04-22  Junio C HamanoMerge branch 'dd/no-gpg-sign'
2020-04-22  Junio C HamanoMerge branch 'js/t0007-typofix'
2020-04-22  Junio C HamanoMerge branch 'en/sequencer-reflog-action'
2020-04-22  Junio C HamanoMerge branch 'jk/use-quick-lookup-in-clone-for-tag...
2020-04-22  Junio C HamanoMerge branch 'ag/rebase-merge-allow-ff-under-abbrev...
2020-04-22  Junio C HamanoMerge branch 'jk/oid-array-cleanups'
2020-04-22  Junio C HamanoMerge branch 'jm/gitweb-fastcgi-utf8'
2020-04-22  Junio C HamanoMerge branch 'jc/allow-strlen-substitution-in-shell...
2020-04-22  Junio C HamanoMerge branch 'en/pull-do-not-rebase-after-fast-forwarding'
2020-04-22  Junio C HamanoMerge branch 'dl/wrapper-fix-indentation'
2020-04-22  Junio C HamanoMerge branch 'rs/pull-options-sync-code-and-doc'
2020-04-22  Junio C HamanoMerge branch 'pb/rebase-doc-typofix'
2020-04-22  Junio C HamanoMerge branch 'jk/p5310-drop-non-bitmap-timing'
2020-04-22  Junio C HamanoMerge branch 'jk/harden-protocol-v2-delim-handling'
2020-04-22  Junio C HamanoMerge branch 'jk/test-cleanup'
2020-04-22  Junio C HamanoMerge branch 'ak/run-command-on-cygwin-fix'
2020-04-22  Junio C HamanoMerge branch 'dr/midx-avoid-int-underflow'
2020-04-22  Junio C HamanoMerge branch 'dl/test-must-fail-fixes-3'
2020-04-22  Junio C HamanoMerge branch 'js/trace2-env-vars'
2020-04-22  Junio C HamanoMerge branch 'jt/connectivity-check-optim-in-partial...
2020-04-22  Junio C HamanoMerge branch 'bc/faq'
2020-04-22  Junio C HamanoMerge branch 'bk/p4-pre-edit-changelist'
2020-04-22  Junio C HamanoMerge branch 'mt/test-lib-bundled-short-options'
2020-04-22  Junio C HamanoMerge branch 'js/import-tars-do-not-make-phony-files...
2020-04-22  Junio C HamanoMerge branch 'js/test-junit-finalization-fix'
2020-04-22  Junio C HamanoMerge branch 'js/tests-gpg-integration-on-windows'
2020-04-22  Junio C HamanoMerge branch 'jk/t3419-drop-expensive-tests'
2020-04-22  Junio C HamanoMerge branch 'ds/doc-clone-filter'
2020-04-22  Junio C HamanoMerge branch 'ar/test-style-fixes'
2020-04-20  Junio C HamanoSync with 2.26.2
2020-04-19  Jonathan NiederGit 2.26.2 v2.26.2
next