projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'ew/hashmap'
[git] / merge-recursive.c
2019-08-22  Junio C HamanoMerge branch 'sg/t5510-test-i18ngrep-fix' blob | commitdiff | raw
2019-08-22  Junio C HamanoMerge branch 'mt/grep-submodules-working-tree' blob | commitdiff | raw
2019-08-19  Elijah Newrenmerge-recursive: alphabetize include list blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: add sanity checks for relevant merge_o... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARI... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: split internal fields into a separate... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: avoid losing output and leaking memory... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: comment and reorder the merge_options... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: consolidate unnecessary fields in... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: move some definitions around to clean... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: rename 'mrtree' to 'result_tree',... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: use common name for ancestors/common... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: fix some overly long lines blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrencache-tree: share code between functions writing an... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: don't force external callers to do... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: remove useless parameter in merge_trees() blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: exit early if index != head blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: remove another implicit dependency... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: future-proof update_file_flags() again... blob | commitdiff | raw | diff to current
2019-08-19  Derrick Stoleemerge-recursive: introduce an enum for detect_directory... blob | commitdiff | raw | diff to current
2019-08-19  Elijah Newrenmerge-recursive: provide a better label for diff3 commo... blob | commitdiff | raw | diff to current
2019-08-16  Elijah Newrenmerge-recursive: enforce opt->ancestor != NULL when... blob | commitdiff | raw | diff to current
2019-08-16  Elijah Newrenmerge-recursive: be consistent with assert blob | commitdiff | raw | diff to current
2019-08-12  Junio C HamanoSync with Git 2.22.1 blob | commitdiff | raw
2019-08-10  Jiang XinMerge tag 'v2.23.0-rc2' of git://git./git/git blob | commitdiff | raw
2019-08-09  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index... blob | commitdiff | raw | diff to current
2019-08-09  Junio C HamanoMerge branch 'bc/hash-independent-tests-part-4' blob | commitdiff | raw
2019-08-09  Junio C HamanoMerge branch 'rs/plug-strbuf-reak-in-read-alt-refs' blob | commitdiff | raw
2019-08-09  Junio C HamanoMerge branch 'mt/dir-iterator-updates' blob | commitdiff | raw
2019-08-09  Junio C HamanoMerge branch 'ds/commit-graph-incremental' blob | commitdiff | raw
2019-08-08  Junio C HamanoMerge branch 'ja/l10n-fixes' blob | commitdiff | raw
2019-08-08  Junio C HamanoMerge branch 'en/disable-dir-rename-in-recursive-merge' blob | commitdiff | raw
2019-08-08  Junio C HamanoMerge branch 'nd/switch-and-restore' blob | commitdiff | raw | diff to current
2019-08-08  Junio C HamanoMerge branch 'mr/doc-can-not-to-cannot' blob | commitdiff | raw | diff to current
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github... blob | commitdiff | raw | diff to current
2019-08-06  Elijah Newrenmerge-recursive: avoid directory rename detection in... blob | commitdiff | raw | diff to current
2019-08-02  Junio C HamanoMerge branch 'sg/fsck-config-in-doc' blob | commitdiff | raw | diff to current
2019-08-02  Junio C HamanoMerge branch 'js/visual-studio' blob | commitdiff | raw | diff to current
2019-08-01  Junio C HamanoMerge branch 'jc/dir-iterator-test-fix' blob | commitdiff | raw | diff to current
2019-08-01  Junio C HamanoMerge branch 'bc/hash-independent-tests-part-4' blob | commitdiff | raw | diff to current
2019-08-01  Junio C HamanoSync with maint blob | commitdiff | raw | diff to current
2019-07-31  Junio C HamanoMerge branch 'cb/xdiff-no-system-includes-in-dot-c' blob | commitdiff | raw | diff to current
2019-07-31  Junio C HamanoMerge branch 'jk/no-system-includes-in-dot-c' blob | commitdiff | raw | diff to current
2019-07-30  Jiang XinMerge tag 'v2.23.0-rc0' of git://git./git/git blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoSync with maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'js/rebase-cleanup' blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index' blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'sg/travis-gcc-4.8' blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'bb/grep-pcre2-bug-message-fix' blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'fc/fetch-with-import-fix' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'ds/close-object-store' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'jk/trailers-use-config' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'pw/rebase-abort-clean-rewritten' into... blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'nd/completion-no-cache-failure' into... blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'jk/delta-islands-progress-fix' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'ms/submodule-foreach-fix' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'js/rebase-reschedule-applies-only-to... blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end' into... blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'po/doc-branch' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'dl/config-alias-doc' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'cb/fsmonitor-intfix' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'js/t3404-typofix' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'jt/t5551-test-chunked' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'rm/gpg-program-doc-fix' into maint blob | commitdiff | raw | diff to current
2019-07-29  Junio C HamanoMerge branch 'js/unmap-before-ext-diff' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoSync with maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'ab/hash-object-doc' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'cm/send-email-document-req-modules' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'sw/git-p4-unshelve-branched-files' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'js/bisect-helper-check-get-oid-return... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'es/git-debugger-doc' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'mo/clang-format-for-each-update' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'md/url-parse-harden' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'an/ignore-doc-update' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'md/list-objects-filter-memfix' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'jt/partial-clone-missing-ref-delta-base... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'xl/record-partial-clone-origin' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'pb/request-pull-verify-remote-ref' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'mm/p4-unshelve-windows-fix' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'bb/unicode-12.1-reiwa' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'js/fsmonitor-unflake' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'vv/merge-squash-with-explicit-commit... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'js/bundle-verify-require-object-store... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'jk/am-i-resolved-fix' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'jk/HEAD-symref-in-xfer-namespaces' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'ew/server-info-remove-crufts' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'es/grep-require-name-when-needed' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'ds/object-info-for-prefetch-fix' into... blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'mh/import-transport-fd-fix' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'nd/corrupt-worktrees' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'nd/init-relative-template-fix' into maint blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'jk/test-commit-bulk' blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'di/readme-markup-fix' blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve' blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'js/clean-report-too-long-a-path' blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'tg/stash-keep-index-with-removed-paths' blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end' blob | commitdiff | raw | diff to current
2019-07-25  Junio C HamanoMerge branch 'js/mingw-spawn-with-spaces-in-path' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.