Merge branch 'en/merge-recursive-directory-rename-fixes'
[thirdparty/git.git] / merge-recursive.c
2019-11-10  Junio C HamanoMerge branch 'en/merge-recursive-directory-rename-fixes'
2019-11-10  Junio C HamanoMerge branch 'js/rebase-deprecate-preserve-merges'
2019-11-10  Junio C HamanoMerge branch 'hv/bitshift-constants-in-blame'
2019-11-10  Junio C HamanoMerge branch 'pw/post-commit-from-sequencer'
2019-11-10  Junio C HamanoMerge branch 'dl/format-patch-cover-from-desc'
2019-11-10  Junio C HamanoMerge branch 'es/walken-tutorial'
2019-11-10  Junio C HamanoMerge branch 'jt/fetch-pack-record-refs-in-the-dot...
2019-11-04  Junio C HamanoMerge branch 'bc/doc-use-docbook-5'
2019-11-04  Junio C HamanoMerge branch 'ds/commit-graph-on-fetch'
2019-11-04  Junio C HamanoMerge https://github.com/prati0100/git-gui
2019-10-30  Junio C HamanoMerge branch 'wb/fsmonitor-bitmap-fix'
2019-10-30  Junio C HamanoMerge branch 'rl/gitweb-blame-prev-fix'
2019-10-30  Junio C HamanoMerge branch 'js/mingw-needs-hiding-fix'
2019-10-24  Junio C HamanoMerge branch 'ds/feature-macros'
2019-10-24  Junio C HamanoMerge branch 'bw/format-patch-o-create-leading-dirs'
2019-10-24  Junio C HamanoMerge branch 'dl/submodule-set-branch'
2019-10-23  Junio C HamanoMerge branch 'cb/pcre2-chartables-leakfix'
2019-10-23  Junio C HamanoMerge branch 'bc/smart-http-atomic-push'
2019-10-23  Junio C HamanoMerge branch 'wb/fsmonitor-bitmap-fix'
2019-10-23  Junio C HamanoMerge branch 'sb/userdiff-dts'
2019-10-23  Junio C HamanoMerge branch 'sg/progress-fix'
2019-10-23  Junio C HamanoMerge branch 'nr/diff-highlight-indent-fix'
2019-10-23  Junio C HamanoMerge branch 'mb/clarify-zsh-completion-doc'
2019-10-23  Elijah Newrenmerge-recursive: fix merging a subdirectory into the...
2019-10-23  Elijah Newrenmerge-recursive: clean up get_renamed_dir_portion()
2019-10-23  Junio C HamanoMerge branch 'js/azure-pipelines-msvc'
2019-10-22  Jiang XinMerge branch 'master' of github.com:alshopov/git-po...
2019-10-21  Jiang XinMerge remote-tracking branch 'git-po/master' into git...
2019-10-18  Junio C HamanoMerge branch 'rs/remote-curl-use-argv-array'
2019-10-18  Junio C HamanoMerge branch 'rs/column-use-utf8-strnwidth'
2019-10-18  Junio C HamanoMerge branch 'rs/http-push-simplify'
2019-10-18  Junio C HamanoMerge branch 'jj/stash-reset-only-toplevel'
2019-10-18  Junio C HamanoMerge branch 'bw/format-patch-o-create-leading-dirs'
2019-10-18  Junio C HamanoMerge branch 'bb/compat-util-comment-fix'
2019-10-18  Junio C HamanoMerge branch 'bb/utf8-wcwidth-cleanup'
2019-10-18  Junio C HamanoMerge branch 'dl/allow-running-cocci-verbosely'
2019-10-18  Junio C HamanoMerge branch 'dl/compat-cleanup'
2019-10-18  Junio C HamanoMerge branch 'ta/t1308-typofix'
2019-10-18  Junio C HamanoMerge branch 'js/doc-stash-save'
2019-10-15  Junio C HamanoMerge branch 'jk/coc'
2019-10-15  Junio C HamanoMerge branch 'js/trace2-fetch-push'
2019-10-15  Junio C HamanoMerge branch 'jt/push-avoid-lazy-fetch'
2019-10-15  Junio C HamanoMerge branch 'dl/format-patch-doc-test-cleanup'
2019-10-15  Junio C HamanoMerge branch 'js/xdiffi-comment-updates'
2019-10-15  Junio C HamanoMerge branch 'dl/t0000-skip-test-test'
2019-10-15  Junio C HamanoMerge branch 'tg/range-diff-output-update'
2019-10-15  Junio C HamanoMerge branch 'gs/sq-quote-buf-pretty'
2019-10-15  Junio C HamanoMerge branch 'ew/hashmap'
2019-10-15  Junio C HamanoMerge branch 'js/trace2-cap-max-output-files'
2019-10-15  Junio C HamanoMerge branch 'am/t0028-utf16-tests'
2019-10-15  Junio C HamanoMerge branch 'dl/octopus-graph-bug'
2019-10-15  Junio C HamanoMerge branch 'en/fast-imexport-nested-tags'
2019-10-15  Junio C HamanoMerge branch 'js/azure-pipelines-msvc'
2019-10-15  Junio C HamanoMerge branch 'gs/commit-graph-trace-with-cmd'
2019-10-15  Junio C HamanoMerge branch 'js/fetch-jobs'
2019-10-15  Junio C HamanoMerge branch 'en/merge-recursive-cleanup'
2019-10-11  Junio C HamanoMerge branch 'dl/rev-list-doc-cleanup'
2019-10-11  Junio C HamanoMerge branch 'kt/add-i-progress'
2019-10-11  Junio C HamanoMerge branch 'js/stash-apply-in-secondary-worktree'
2019-10-11  Junio C HamanoMerge branch 'rs/dedup-includes'
2019-10-11  Junio C HamanoMerge branch 'js/range-diff-noprefix'
2019-10-11  Junio C HamanoMerge branch 'cb/pcre1-cleanup'
2019-10-11  Junio C HamanoMerge branch 'ab/pcre-jit-fixes'
2019-10-11  Junio C HamanoMerge branch 'pw/rebase-i-show-HEAD-to-reword'
2019-10-11  Junio C HamanoMerge branch 'tk/git-svn-trim-author-name'
2019-10-11  Junio C HamanoMerge branch 'bc/object-id-part17'
2019-10-11  Junio C HamanoMerge branch 'en/clean-nested-with-ignored'
2019-10-09  Junio C HamanoMerge branch 'rs/test-remove-useless-debugging-cat'
2019-10-09  Junio C HamanoMerge branch 'pm/p4-auto-delete-named-temporary'
2019-10-09  Junio C HamanoMerge branch 'rs/convert-fix-utf-without-dash'
2019-10-09  Junio C HamanoMerge branch 'py/git-gui-has-maintainer'
2019-10-09  Junio C HamanoMerge branch 'ah/cleanups'
2019-10-09  Junio C HamanoMerge branch 'js/diff-rename-force-stable-sort'
2019-10-09  Junio C HamanoMerge branch 'js/mingw-spawn-with-spaces-in-path'
2019-10-09  Junio C HamanoMerge branch 'as/shallow-slab-use-fix'
2019-10-09  Junio C HamanoMerge branch 'sg/name-rev-cutoff-underflow-fix'
2019-10-09  Junio C HamanoMerge branch 'am/visual-studio-config-fix'
2019-10-08  Elijah Newrenmerge-recursive: fix the fix to the diff3 common ancest...
2019-10-07  Junio C HamanoMerge branch 'bw/submodule-helper-usage-fix'
2019-10-07  Junio C HamanoMerge branch 'dl/honor-cflags-in-hdr-check'
2019-10-07  Junio C HamanoMerge branch 'cb/do-not-use-test-cmp-with-a'
2019-10-07  Junio C HamanoMerge branch 'cc/multi-promisor'
2019-10-07  Junio C HamanoMerge branch 'jt/merge-recursive-symlink-is-not-a-dir...
2019-10-07  Junio C HamanoMerge branch 'rs/nth-parent-parse'
2019-10-07  Junio C HamanoMerge branch 'dl/submodule-set-branch'
2019-10-07  Junio C HamanoMerge branch 'jk/list-objects-optim-wo-trees'
2019-10-07  Eric Wonghashmap: remove type arg from hashmap_{get,put,remove...
2019-10-07  Eric WongOFFSETOF_VAR macro to simplify hashmap iterators
2019-10-07  Eric Wonghashmap: introduce hashmap_free_entries
2019-10-07  Eric Wonghashmap: use *_entry APIs for iteration
2019-10-07  Eric Wonghashmap_cmp_fn takes hashmap_entry params
2019-10-07  Eric Wonghashmap_get{,_from_hash} return "struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_put takes "struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_remove takes "const struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_get takes "const struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_add takes "struct hashmap_entry *"
2019-10-07  Eric Wonghashmap_entry_init takes "struct hashmap_entry *"
2019-10-06  Junio C HamanoMerge branch 'cb/skip-utf8-check-with-pcre1'
2019-10-06  Junio C HamanoMerge branch 'ma/asciidoctor-refmiscinfo'
2019-10-02  Elijah Newrenmerge-recursive: fix the diff3 common ancestor label...
next