projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
fetch-pack: print and use dangling .gitmodules
[git] / merge-ort.c
2021-01-16  Junio C HamanoMerge branch 'jc/macos-install-dependencies-fix' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'tb/local-clone-race-doc' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'bc/doc-status-short' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'dl/p4-encode-after-kw-expansion' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'ab/gettext-charset-comment-fix' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'ug/doc-lose-dircache' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'ad/t4129-setfacl-target-fix' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'jk/t5516-deflake' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'vv/send-email-with-less-secure-apps-access' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'pb/mergetool-tool-help-fix' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'ds/for-each-repo-noopfix' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'jc/sign-off' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'mt/t4129-with-setgid-dir' blob | commitdiff | raw
2021-01-16  Junio C HamanoMerge branch 'ds/maintenance-part-4' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'fc/completion-aliases-support' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'en/stash-apply-sparse-checkout' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ar/t6016-modernise' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'zh/arg-help-format' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'nk/perf-fsmonitor-cleanup' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ds/trace2-topo-walk' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'rs/rebase-commit-validation' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ma/sha1-is-a-hash' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ma/doc-pack-format-varint-for-sizes' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ma/t1300-cleanup' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'pb/doc-modules-git-work-tree-typofix' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ta/doc-typofix' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'bc/rev-parse-path-format' blob | commitdiff | raw
2021-01-15  Junio C HamanoMerge branch 'ew/decline-core-abbrev' blob | commitdiff | raw
2021-01-07  Junio C HamanoMerge branch 'es/perf-export-fix' blob | commitdiff | raw
2021-01-07  Junio C HamanoMerge branch 'fc/t6030-bisect-reset-removes-auxiliary... blob | commitdiff | raw
2021-01-07  Junio C HamanoMerge branch 'es/worktree-repair-both-moved' blob | commitdiff | raw
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-recursive' blob | commitdiff | raw
2021-01-07  Junio C HamanoMerge branch 'fc/pull-merge-rebase' blob | commitdiff | raw | diff to current
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-2' blob | commitdiff | raw | diff to current
2021-01-07  Junio C HamanoMerge branch 'en/merge-ort-impl' blob | commitdiff | raw | diff to current
2021-01-07  Junio C HamanoMerge branch 'tb/pack-bitmap' blob | commitdiff | raw | diff to current
2021-01-07  Junio C HamanoMerge branch 'pk/subsub-fetch-fix-take-2' blob | commitdiff | raw | diff to current
2020-12-27  Junio C HamanoMerge branch 'pb/doc-git-linkit-fix' blob | commitdiff | raw | diff to current
2020-12-23  Junio C HamanoMerge branch 'nk/refspecs-negative-fix' blob | commitdiff | raw | diff to current
2020-12-23  Junio C HamanoMerge branch 'dl/checkout-p-merge-base' blob | commitdiff | raw | diff to current
2020-12-23  Junio C HamanoMerge branch 'jx/pack-redundant-on-single-pack' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge branch 'jc/diff-I-status-fix' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge branch 'es/perf-export-fix' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge branch 'rb/nonstop-config-mak-uname-update' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge branch 'ab/unreachable-break' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge branch 'jc/strmap-remove-typefix' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge branch 'jc/compat-util-setitimer-fix' blob | commitdiff | raw | diff to current
2020-12-18  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw | diff to current
2020-12-17  Junio C HamanoMerge branch 'jh/index-v2-doc-on-fsmn' blob | commitdiff | raw | diff to current
2020-12-17  Junio C HamanoMerge branch 'jb/midx-doc-update' blob | commitdiff | raw | diff to current
2020-12-17  Elijah Newrenmerge-ort: implement merge_incore_recursive() blob | commitdiff | raw
2020-12-17  Elijah Newrenmerge-ort: make clear_internal_opts() aware of partial... blob | commitdiff | raw | diff to current
2020-12-17  Elijah Newrenmerge-ort: copy a few small helper functions from merge... blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'js/cmake-extra-built-ins-fix' blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'da/vs-build-iconv-fix' blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'jk/multi-line-indent-style-fix' blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'jk/check-config-parsing-error-in-upload... blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'ae/doc-reproducible-html' blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'so/glossary-branch-is-not-necessarily... blob | commitdiff | raw | diff to current
2020-12-14  Junio C HamanoMerge branch 'dd/help-autocorrect-never' blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add modify/delete handling and delayed outpu... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add die-not-implemented stub handle_content_... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add function grouping comments blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add a paths_to_free field to merge_options_i... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add a path_conflict field to merge_options_i... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add a clear_internal_opts helper blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add a few includes blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: free data structures in merge_finalize() blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add implementation of record_conflicted_inde... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add implementation of checkout() blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: basic outline for merge_switch_to_result() blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: step 3 of tree writing -- handling subdirect... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: step 2 of tree writing -- function to create... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: step 1 of tree writing -- record basenames... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: have process_entries operate in a defined... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add a preliminary simple process_entries... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: avoid recursing into identical trees blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: record stage and auxiliary info for every... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: compute a few more useful fields for collect... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: avoid repeating fill_tree_descriptor() on... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: implement a very basic collect_merge_info() blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add an err() function similar to one from... blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: use histogram diff blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: port merge_start() from merge-recursive blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: add some high-level algorithm structure blob | commitdiff | raw | diff to current
2020-12-13  Elijah Newrenmerge-ort: setup basic internal data structures blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'fc/zsh-completion' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'sn/config-doc-typofix' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'rs/fetch-pack-invalid-lockfile' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'js/trace2-session-id' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'mt/do-not-use-scld-in-working-tree' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'ds/maintenance-part-2' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'ds/maintenance-part-1' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'tb/idx-midx-race-fix' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'ps/update-ref-multi-transaction' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'js/add-i-color-fix' blob | commitdiff | raw | diff to current
2020-12-08  Junio C HamanoMerge branch 'jt/trace-error-on-warning' blob | commitdiff | raw | diff to current
2020-12-03  Junio C HamanoMerge branch 'pk/subsub-fetch-fix' blob | commitdiff | raw | diff to current
2020-12-03  Junio C HamanoMerge branch 'jk/stop-pack-objects-when-fetch-is-killed' blob | commitdiff | raw | diff to current
2020-12-03  Junio C HamanoMerge branch 'jk/stop-pack-objects-when-push-is-killed' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.