projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
merge-ort: implement handle_path_level_conflicts()
[git] / merge-ort-wrappers.c
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 'tb/pack-bitmap' blob | commitdiff | raw
2021-01-07  Junio C HamanoMerge branch 'pk/subsub-fetch-fix-take-2' blob | commitdiff | raw
2020-12-27  Junio C HamanoMerge branch 'pb/doc-git-linkit-fix' blob | commitdiff | raw
2020-12-23  Junio C HamanoMerge branch 'nk/refspecs-negative-fix' blob | commitdiff | raw
2020-12-23  Junio C HamanoMerge branch 'dl/checkout-p-merge-base' blob | commitdiff | raw
2020-12-23  Junio C HamanoMerge branch 'jx/pack-redundant-on-single-pack' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge branch 'jc/diff-I-status-fix' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge branch 'es/perf-export-fix' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge branch 'rb/nonstop-config-mak-uname-update' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge branch 'ab/unreachable-break' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge branch 'jc/strmap-remove-typefix' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge branch 'jc/compat-util-setitimer-fix' blob | commitdiff | raw
2020-12-18  Junio C HamanoMerge https://github.com/prati0100/git-gui blob | commitdiff | raw
2020-12-17  Junio C HamanoMerge branch 'jh/index-v2-doc-on-fsmn' blob | commitdiff | raw
2020-12-17  Junio C HamanoMerge branch 'jb/midx-doc-update' blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'js/cmake-extra-built-ins-fix' blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'da/vs-build-iconv-fix' blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'jk/multi-line-indent-style-fix' blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'jk/check-config-parsing-error-in-upload... blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'ae/doc-reproducible-html' blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'so/glossary-branch-is-not-necessarily... blob | commitdiff | raw
2020-12-14  Junio C HamanoMerge branch 'dd/help-autocorrect-never' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'fc/zsh-completion' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'sn/config-doc-typofix' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'rs/fetch-pack-invalid-lockfile' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'js/trace2-session-id' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'mt/do-not-use-scld-in-working-tree' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'ds/maintenance-part-2' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'ds/maintenance-part-1' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'tb/idx-midx-race-fix' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'ps/update-ref-multi-transaction' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'js/add-i-color-fix' blob | commitdiff | raw
2020-12-08  Junio C HamanoMerge branch 'jt/trace-error-on-warning' blob | commitdiff | raw
2020-12-03  Junio C HamanoMerge branch 'pk/subsub-fetch-fix' blob | commitdiff | raw
2020-12-03  Junio C HamanoMerge branch 'jk/stop-pack-objects-when-fetch-is-killed' blob | commitdiff | raw
2020-12-03  Junio C HamanoMerge branch 'jk/stop-pack-objects-when-push-is-killed' blob | commitdiff | raw
2020-12-03  Junio C HamanoMerge branch 'tb/repack-simplify' blob | commitdiff | raw
2020-12-03  Junio C HamanoMerge branch 'pb/pull-rebase-recurse-submodules' blob | commitdiff | raw
2020-12-03  Junio C HamanoMerge branch 'ab/retire-parse-remote' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'km/stash-error-message-fix' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'hn/sleep-millisec-decl' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'na/notes-displayref-is-not-boolean' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'jc/do-not-just-explain-but-update-your... blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'mt/worktree-error-message-fix' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'ab/gc-keep-base-option' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'js/pull-rebase-use-advise' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'js/t4015-wo-master' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'js/t3040-cleanup' blob | commitdiff | raw
2020-11-30  Junio C HamanoMerge branch 'js/t2106-cleanup' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'sg/tests-prereq' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'rs/plug-diff-cache-leak' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'jc/ci-github-set-env' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'sg/t5310-jgit-wants-sha1' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'rs/archive-plug-leak-refname' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'ma/list-object-filter-opt-msgfix' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'pk/subsub-fetch-fix' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'jk/4gb-idx' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'jx/t5411-flake-fix' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'rs/hashwrite-be64' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'sg/bisect-approximately-halfway' blob | commitdiff | raw
2020-11-25  Junio C HamanoMerge branch 'fc/bash-completion-alias-of-alias' blob | commitdiff | raw
2020-11-21  Junio C HamanoMerge branch 'pd/mergetool-nvimdiff' blob | commitdiff | raw
2020-11-21  Junio C HamanoMerge branch 'ab/config-mak-uname-simplify' blob | commitdiff | raw
2020-11-21  Junio C HamanoMerge branch 'en/strmap' blob | commitdiff | raw
2020-11-21  Junio C HamanoMerge branch 'jk/diff-release-filespec-fix' blob | commitdiff | raw
2020-11-21  Junio C HamanoMerge branch 'jk/rev-parse-end-of-options' blob | commitdiff | raw
2020-11-21  Junio C HamanoMerge branch 'jc/format-patch-name-max' blob | commitdiff | raw
2020-11-18  Junio C HamanoMerge branch 'jc/blame-ignore-fix' blob | commitdiff | raw
2020-11-18  Junio C HamanoMerge branch 'jc/sparse-error-for-developer-build' blob | commitdiff | raw
2020-11-18  Junio C HamanoMerge branch 'pb/blame-funcname-range-userdiff' blob | commitdiff | raw
2020-11-18  Junio C HamanoMerge branch 'en/merge-ort-api-null-impl' blob | commitdiff | raw
2020-11-11  Junio C HamanoMerge branch 'en/strmap' into en/merge-ort-impl blob | commitdiff | raw
2020-10-27  Elijah Newrenmerge-ort-wrappers: new convience wrappers to mimic... blob | commitdiff | raw
Unnamed repository; edit this file 'description' to name the repository.