projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
t6429: testcases for remembering renames
[git]
/
merge-ort.c
2021-03-20
Elijah Newren
Revert "merge-ort: ignore the directory rename split...
blob
|
commitdiff
|
raw
2021-03-20
Elijah Newren
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-20
Elijah Newren
merge-ort: implement CE_SKIP_WORKTREE handling with...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-20
Elijah Newren
merge-ort: support subtree shifting
blob
|
commitdiff
|
raw
|
diff to current
2021-03-20
Elijah Newren
merge-ort: let renormalization change modify/delete...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-20
Elijah Newren
merge-ort: have ll_merge() use a special attr_index...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-20
Elijah Newren
merge-ort: add a special minimal index just for renorma...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-20
Elijah Newren
merge-ort: use STABLE_QSORT instead of QSORT where...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-18
Elijah Newren
merge-ort: record the reason that we want a rename...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-18
Elijah Newren
diffcore-rename: add computation of number of unknown...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-18
Elijah Newren
merge-ort: record the reason that we want a rename...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-18
Elijah Newren
merge-ort, diffcore-rename: tweak dirs_removed and...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
merge-ort: skip rename detection entirely if possible
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
merge-ort: use relevant_sources to filter possible...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
merge-ort: precompute whether directory rename detectio...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
merge-ort: introduce wrappers for alternate tree traversal
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
merge-ort: add data structures for an alternate tree...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
merge-ort: precompute subset of sources for which we...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-11
Elijah Newren
diffcore-rename: enable filtering possible rename sources
blob
|
commitdiff
|
raw
|
diff to current
2021-02-27
Elijah Newren
diffcore-rename: add function for clearing dir_rename_count
blob
|
commitdiff
|
raw
|
diff to current
2021-02-27
Elijah Newren
Move computation of dir_rename_count from merge-ort...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-16
Elijah Newren
merge-ort: call diffcore_rename() directly
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Junio C Hamano
Merge branch 'en/merge-ort-perf'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Junio C Hamano
Merge branch 'en/ort-directory-rename'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Junio C Hamano
Merge branch 'tb/ci-run-cocci-with-18.04'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'ab/detox-gettext-tests'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'ab/grep-pcre-invalid-utf8'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'ab/retire-pcre1'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'jk/pretty-lazy-load-commit'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'ds/more-index-cleanups'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'rs/worktree-list-verbose'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'js/rebase-i-commit-cleanup-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'jk/t0000-cleanups'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'sg/t7800-difftool-robustify'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'ab/lose-grep-debug'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-10
Junio C Hamano
Merge branch 'jk/use-oid-pos'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
Junio C Hamano
Sync with 2.30.1
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
Junio C Hamano
Merge branch 'pb/blame-funcname-range-userdiff' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
Junio C Hamano
Merge branch 'dl/p4-encode-after-kw-expansion' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
Junio C Hamano
Merge branch 'ma/doc-pack-format-varint-for-sizes'...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-08
Junio C Hamano
Merge branch 'fc/t6030-bisect-reset-removes-auxiliary...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'sg/test-stress-jobs'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'jk/weather-balloon-require-variadic-macro'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'pb/ci-matrix-wo-shortcut'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'pb/blame-funcname-range-userdiff'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'jk/p5303-sed-portability-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'jv/pack-objects-narrower-ref-iteration'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'ph/use-delete-refs'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'tb/ls-refs-optim'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'zh/ls-files-deduplicate'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'ds/cache-tree-basics'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'en/ort-conflict-handling'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'so/log-diff-merge'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'js/skip-dashed-built-ins-from-config...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'ab/fsck-doc-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'jk/log-cherry-pick-duplicate-patches...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'jk/forbid-lf-in-git-url' into maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'ad/t4129-setfacl-target-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'vv/send-email-with-less-secure-apps-acces...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'pb/mergetool-tool-help-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'rs/rebase-commit-validation' into maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'pb/doc-modules-git-work-tree-typofix...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-06
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix-take-2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Junio C Hamano
Merge branch 'jk/run-command-use-shell-doc'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Junio C Hamano
Merge branch 'jk/peel-iterated-oid'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Junio C Hamano
Merge branch 'js/skip-dashed-built-ins-from-config...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Junio C Hamano
Merge branch 'jt/packfile-as-uri-doc'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Junio C Hamano
Merge branch 'ds/maintenance-prefetch-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Junio C Hamano
Merge branch 'ab/fsck-doc-fix'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ab/mailmap-fixup'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'tb/pack-revindex-api'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ab/coc-update-to-2.0'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ps/config-env-pairs'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'cc/write-promisor-file'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'jx/bundle'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ab/mailmap'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ps/fetch-atomic'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'jk/log-cherry-pick-duplicate-patches'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'js/default-branch-name-tests-final-stretch'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'dl/reflog-with-single-entry'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'sj/untracked-files-in-submodule-directory...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'jc/deprecate-pack-redundant'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'jk/forbid-lf-in-git-url'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ab/branch-sort'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'en/diffcore-rename'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ma/more-opaque-lock-file'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'en/merge-ort-3'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Junio C Hamano
Merge branch 'ab/mktag'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-24
Elijah Newren
merge-ort: begin performance work; instrument with...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-24
Elijah Newren
merge-ort: ignore the directory rename split conflict...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-24
Elijah Newren
merge-ort: fix massive leak
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Junio C Hamano
Merge branch 'en/ort-directory-rename' into en/merge...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Elijah Newren
merge-ort: fix a directory rename detection bug
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Elijah Newren
merge-ort: process_renames() now needs more defensiveness
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Elijah Newren
merge-ort: implement apply_directory_rename_modifications()
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Elijah Newren
merge-ort: add a new toplevel_dir field
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Elijah Newren
merge-ort: implement handle_path_level_conflicts()
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Elijah Newren
merge-ort: implement check_for_directory_rename()
blob
|
commitdiff
|
raw
|
diff to current
next