git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom