]> 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-04-19  Jonathan NiederGit 2.25.4 v2.25.4
2020-04-19  Jonathan NiederGit 2.24.3 v2.24.3
2020-04-19  Jonathan NiederGit 2.23.3 v2.23.3
2020-04-19  Jonathan NiederGit 2.22.4 v2.22.4
2020-04-19  Jonathan NiederGit 2.21.3 v2.21.3
2020-04-19  Jonathan NiederGit 2.20.4 v2.20.4
2020-04-19  Jonathan NiederGit 2.19.5 v2.19.5
2020-04-19  Jonathan NiederGit 2.18.4 v2.18.4
2020-04-14  Junio C HamanoSync with v2.26.1
2020-04-08  Junio C HamanoMerge branch 'dd/ci-musl-libc' into HEAD
2020-04-08  Junio C HamanoMerge branch 'dd/test-with-busybox' into HEAD
2020-03-29  Junio C HamanoMerge branch 'ds/default-pack-use-sparse-to-true'
2020-03-27  Junio C HamanoMerge branch 'ah/force-pull-rebase-configuration'
2020-03-27  Junio C HamanoMerge branch 'tg/retire-scripted-stash'
2020-03-27  Junio C HamanoMerge branch 'jc/describe-misnamed-annotated-tag'
2020-03-27  Junio C HamanoMerge branch 'at/rebase-fork-point-regression-fix'
2020-03-27  Junio C HamanoMerge branch 'bc/filter-process'
2020-03-27  Junio C HamanoMerge branch 'hi/gpg-prefer-check-signature'
2020-03-27  Junio C HamanoMerge branch 'bc/sha-256-part-1-of-4'
2020-03-27  Junio C HamanoMerge branch 'pb/recurse-submodules-fix'
2020-03-25  Junio C HamanoMerge branch 'jc/config-tar'
2020-03-25  Junio C HamanoMerge branch 'en/oidset-uninclude-hashmap'
2020-03-25  Junio C HamanoMerge branch 'rs/doc-passthru-fetch-options'
2020-03-25  Junio C HamanoMerge branch 'pw/advise-rebase-skip'
2020-03-25  Junio C HamanoMerge branch 'yz/p4-py3'
2020-03-25  Junio C HamanoMerge branch 'am/real-path-fix'
2020-03-25  Junio C HamanoMerge branch 'sg/commit-slab-clarify-peek'
2020-03-25  Junio C HamanoMerge branch 'jc/maintain-doc'
2020-03-25  Junio C HamanoMerge branch 'js/https-proxy-config'
2020-03-25  Junio C HamanoMerge branch 'hw/advise-ng'
2020-03-25  Junio C HamanoGit 2.26.1 v2.26.1
2020-03-21  Junio C HamanoMerge branch 'en/rebase-backend'
2020-03-19  Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-18  Junio C HamanoGit 2.25.3 v2.25.3
2020-03-17  Junio C HamanoSync with Git 2.25.2
2020-03-17  Junio C HamanoMerge branch 'js/ci-windows-update' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/run-command-formatfix' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/doc-credential-helper' into maint
2020-03-17  Junio C HamanoMerge branch 'js/mingw-open-in-gdb' into maint
2020-03-17  Junio C HamanoMerge branch 'js/test-unc-fetch' into maint
2020-03-17  Junio C HamanoMerge branch 'js/test-write-junit-xml-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'en/simplify-check-updates-in-unpack-trees...
2020-03-17  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help' into maint
2020-03-17  Junio C HamanoMerge branch 'hd/show-one-mergetag-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'am/mingw-poll-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'hi/gpg-use-check-signature' into maint
2020-03-17  Junio C HamanoMerge branch 'ds/partial-clone-fixes' into maint
2020-03-17  Junio C HamanoMerge branch 'en/t3433-rebase-stat-dirty-failure' into...
2020-03-17  Junio C HamanoMerge branch 'en/check-ignore' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/push-option-doc-markup-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/doc-diff-parallel' into maint
2020-03-17  Junio C HamanoMerge branch 'jh/notes-fanout-fix' into maint
2020-03-17  Junio C HamanoMerge branch 'jk/index-pack-dupfix' into maint
2020-03-17  Junio C HamanoMerge branch 'js/rebase-i-with-colliding-hash' into...
2020-03-17  Junio C HamanoMerge branch 'jk/clang-sanitizer-fixes' into maint
2020-03-17  Junio C HamanoMerge branch 'js/builtin-add-i-cmds' into maint
2020-03-17  Junio C HamanoGit 2.24.2 v2.24.2
2020-03-17  Junio C HamanoGit 2.23.2 v2.23.2
2020-03-17  Junio C HamanoGit 2.22.3 v2.22.3
2020-03-17  Junio C HamanoGit 2.21.2 v2.21.2
2020-03-17  Junio C HamanoGit 2.20.3 v2.20.3
2020-03-17  Junio C HamanoGit 2.19.4 v2.19.4
2020-03-17  Junio C HamanoGit 2.18.3 v2.18.3
2020-03-16  Junio C HamanoMerge branch 'en/test-cleanup'
2020-03-16  Junio C HamanoMerge branch 'es/outside-repo-errmsg-hints'
2020-03-16  brian m. carlsonconvert: permit passing additional metadata to filter...
2020-03-12  Junio C HamanoMerge branch 'en/rebase-backend'
2020-03-11  Junio C HamanoMerge branch 'ds/sparse-add'
2020-03-11  Junio C HamanoMerge branch 'dr/push-remote-ref-update'
2020-03-11  Junio C HamanoMerge branch 'jc/doc-single-h-is-for-help'
2020-03-11  Jiang XinMerge branch 'master' of github.com:git/git into git...
2020-03-09  Junio C HamanoMerge branch 'rs/show-progress-in-dumb-http-fetch'
2020-03-09  Junio C HamanoMerge branch 'hd/show-one-mergetag-fix'
2020-03-09  Junio C HamanoMerge branch 'rt/format-zero-length-fix'
2020-03-09  Junio C HamanoMerge branch 'am/mingw-poll-fix'
2020-03-09  Junio C HamanoMerge branch 'en/test-cleanup'
2020-03-09  Junio C HamanoMerge branch 'en/merge-path-collision'
2020-03-09  Junio C HamanoMerge branch 'kk/complete-diff-color-moved'
2020-03-09  Junio C HamanoMerge branch 'rj/t1050-use-test-path-is-file'
2020-03-09  Junio C HamanoMerge branch 'pb/am-show-current-patch'
2020-03-09  Junio C HamanoMerge branch 'am/pathspec-f-f-more'
2020-03-08  Jiang XinMerge branch of github.com:alshopov/git-po into master
2020-03-06  Jiang XinMerge branch 'master' of github.com:git-l10n/git-po
2020-03-05  Junio C HamanoMerge branch 'hi/gpg-use-check-signature'
2020-03-05  Junio C HamanoMerge branch 'rs/commit-graph-code-simplification'
2020-03-05  Junio C HamanoMerge branch 'js/ci-windows-update'
2020-03-05  Junio C HamanoMerge branch 'be/describe-multiroot'
2020-03-05  Junio C HamanoMerge branch 'ag/rebase-remove-redundant-code'
2020-03-05  Junio C HamanoMerge branch 'es/recursive-single-branch-clone'
2020-03-05  Junio C HamanoMerge branch 'jk/nth-packed-object-id'
2020-03-05  Junio C HamanoMerge branch 'es/do-not-let-rebase-switch-to-protected...
2020-03-05  Junio C HamanoMerge branch 'hv/receive-denycurrent-everywhere'
2020-03-05  Junio C HamanoMerge branch 'es/worktree-avoid-duplication-fix'
2020-03-05  Junio C HamanoMerge branch 'bc/wildcard-credential'
2020-03-05  Junio C HamanoMerge branch 'mr/bisect-in-c-1'
2020-03-05  Junio C HamanoMerge branch 'ds/sparse-add'
2020-03-02  Junio C HamanoMerge branch 'ma/test-cleanup'
2020-03-02  Junio C HamanoMerge branch 'rs/blame-typefix-for-fingerprint'
2020-03-02  Junio C HamanoMerge branch 'rs/micro-cleanups'
2020-03-02  Junio C HamanoMerge branch 'es/worktree-cleanup'
next