projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
doc hash-function-transition: fix asciidoc output
[git]
/
merge-ort.c
2021-01-25
Junio C Hamano
Merge branch 'ab/mailmap-fixup'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'tb/pack-revindex-api'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ab/coc-update-to-2.0'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ps/config-env-pairs'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'cc/write-promisor-file'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'jx/bundle'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ab/mailmap'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ps/fetch-atomic'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'jk/log-cherry-pick-duplicate-patches'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'js/default-branch-name-tests-final-stretch'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'dl/reflog-with-single-entry'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'sj/untracked-files-in-submodule-directory...
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'jc/deprecate-pack-redundant'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'jk/forbid-lf-in-git-url'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ab/branch-sort'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'en/diffcore-rename'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ma/more-opaque-lock-file'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'en/merge-ort-3'
blob
|
commitdiff
|
raw
2021-01-25
Junio C Hamano
Merge branch 'ab/mktag'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'jc/macos-install-dependencies-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'tb/local-clone-race-doc'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'bc/doc-status-short'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'dl/p4-encode-after-kw-expansion'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'ab/gettext-charset-comment-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'ug/doc-lose-dircache'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'ad/t4129-setfacl-target-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'jk/t5516-deflake'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'vv/send-email-with-less-secure-apps-access'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'pb/mergetool-tool-help-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'ds/for-each-repo-noopfix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'jc/sign-off'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'mt/t4129-with-setgid-dir'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-16
Junio C Hamano
Merge branch 'ds/maintenance-part-4'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'fc/completion-aliases-support'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'en/stash-apply-sparse-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ar/t6016-modernise'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'zh/arg-help-format'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'nk/perf-fsmonitor-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ds/trace2-topo-walk'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'rs/rebase-commit-validation'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ma/sha1-is-a-hash'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ma/doc-pack-format-varint-for-sizes'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ma/t1300-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'pb/doc-modules-git-work-tree-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ta/doc-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'bc/rev-parse-path-format'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Junio C Hamano
Merge branch 'ew/decline-core-abbrev'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'es/perf-export-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'fc/t6030-bisect-reset-removes-auxiliary...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'es/worktree-repair-both-moved'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'fc/pull-merge-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-2'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-impl'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'tb/pack-bitmap'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix-take-2'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-27
Junio C Hamano
Merge branch 'pb/doc-git-linkit-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
Junio C Hamano
Merge branch 'nk/refspecs-negative-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
Junio C Hamano
Merge branch 'dl/checkout-p-merge-base'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-23
Junio C Hamano
Merge branch 'jx/pack-redundant-on-single-pack'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge branch 'jc/diff-I-status-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge branch 'es/perf-export-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge branch 'rb/nonstop-config-mak-uname-update'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge branch 'ab/unreachable-break'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge branch 'jc/strmap-remove-typefix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge branch 'jc/compat-util-setitimer-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-18
Junio C Hamano
Merge https://github.com/prati0100/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Junio C Hamano
Merge branch 'jh/index-v2-doc-on-fsmn'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Junio C Hamano
Merge branch 'jb/midx-doc-update'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Elijah Newren
merge-ort: implement merge_incore_recursive()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Elijah Newren
merge-ort: make clear_internal_opts() aware of partial...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-17
Elijah Newren
merge-ort: copy a few small helper functions from merge...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-16
Elijah Newren
merge-ort: add implementation of type-changed rename...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-16
Elijah Newren
merge-ort: add implementation of normal rename handling
blob
|
commitdiff
|
raw
|
diff to current
2020-12-16
Elijah Newren
merge-ort: add implementation of rename collisions
blob
|
commitdiff
|
raw
|
diff to current
2020-12-16
Elijah Newren
merge-ort: add implementation of rename/delete conflicts
blob
|
commitdiff
|
raw
|
diff to current
2020-12-16
Elijah Newren
merge-ort: add implementation of both sides renaming...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-16
Elijah Newren
merge-ort: add implementation of both sides renaming...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'js/cmake-extra-built-ins-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'da/vs-build-iconv-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'jk/multi-line-indent-style-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'jk/check-config-parsing-error-in-upload...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'ae/doc-reproducible-html'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'so/glossary-branch-is-not-necessarily...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Junio C Hamano
Merge branch 'dd/help-autocorrect-never'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Elijah Newren
merge-ort: add basic outline for process_renames()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Elijah Newren
merge-ort: implement compare_pairs() and collect_renames()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Elijah Newren
merge-ort: implement detect_regular_renames()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Elijah Newren
merge-ort: add initial outline for basic rename detection
blob
|
commitdiff
|
raw
|
diff to current
2020-12-14
Elijah Newren
merge-ort: add basic data structures for handling renames
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add modify/delete handling and delayed outpu...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add die-not-implemented stub handle_content_...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add function grouping comments
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a paths_to_free field to merge_options_i...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a path_conflict field to merge_options_i...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a clear_internal_opts helper
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a few includes
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: free data structures in merge_finalize()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add implementation of record_conflicted_inde...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add implementation of checkout()
blob
|
commitdiff
|
raw
|
diff to current
next