projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
ref-filter: hoist signature parsing
[git]
/
merge-ort.c
2021-01-07
Junio C Hamano
Merge branch 'es/perf-export-fix'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'fc/t6030-bisect-reset-removes-auxiliary...
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'es/worktree-repair-both-moved'
blob
|
commitdiff
|
raw
2021-01-07
Junio C Hamano
Merge branch 'en/merge-ort-recursive'
blob
|
commitdiff
|
raw
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
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-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-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
2020-12-13
Elijah Newren
merge-ort: basic outline for merge_switch_to_result()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: step 3 of tree writing -- handling subdirect...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: step 2 of tree writing -- function to create...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: step 1 of tree writing -- record basenames...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: have process_entries operate in a defined...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add a preliminary simple process_entries...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: avoid recursing into identical trees
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: record stage and auxiliary info for every...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: compute a few more useful fields for collect...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: avoid repeating fill_tree_descriptor() on...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: implement a very basic collect_merge_info()
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add an err() function similar to one from...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: use histogram diff
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: port merge_start() from merge-recursive
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: add some high-level algorithm structure
blob
|
commitdiff
|
raw
|
diff to current
2020-12-13
Elijah Newren
merge-ort: setup basic internal data structures
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'fc/zsh-completion'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'sn/config-doc-typofix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'rs/fetch-pack-invalid-lockfile'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'js/trace2-session-id'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'mt/do-not-use-scld-in-working-tree'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ds/maintenance-part-2'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ds/maintenance-part-1'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'tb/idx-midx-race-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'ps/update-ref-multi-transaction'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'js/add-i-color-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-08
Junio C Hamano
Merge branch 'jt/trace-error-on-warning'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'jk/stop-pack-objects-when-fetch-is-killed'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'jk/stop-pack-objects-when-push-is-killed'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'tb/repack-simplify'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'pb/pull-rebase-recurse-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-03
Junio C Hamano
Merge branch 'ab/retire-parse-remote'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'km/stash-error-message-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'hn/sleep-millisec-decl'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'na/notes-displayref-is-not-boolean'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'jc/do-not-just-explain-but-update-your...
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'mt/worktree-error-message-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'ab/gc-keep-base-option'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/pull-rebase-use-advise'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/t4015-wo-master'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/t3040-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-30
Junio C Hamano
Merge branch 'js/t2106-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'sg/tests-prereq'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'rs/plug-diff-cache-leak'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'jc/ci-github-set-env'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'sg/t5310-jgit-wants-sha1'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'rs/archive-plug-leak-refname'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'ma/list-object-filter-opt-msgfix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'pk/subsub-fetch-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'jk/4gb-idx'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'jx/t5411-flake-fix'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'rs/hashwrite-be64'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'sg/bisect-approximately-halfway'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-25
Junio C Hamano
Merge branch 'fc/bash-completion-alias-of-alias'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'pd/mergetool-nvimdiff'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'ab/config-mak-uname-simplify'
blob
|
commitdiff
|
raw
|
diff to current
2020-11-21
Junio C Hamano
Merge branch 'en/strmap'
blob
|
commitdiff
|
raw
|
diff to current
next