Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge-tree.c
Age
Commit message (
Expand
)
Author
2022-06-23
merge-tree: add a --allow-unrelated-histories flag
Elijah Newren
2022-06-23
merge-tree: allow `ls-files -u` style info to be NUL terminated
Elijah Newren
2022-06-23
merge-ort: optionally produce machine-readable output
Elijah Newren
2022-06-23
merge-tree: provide easy access to `ls-files -u` style info
Elijah Newren
2022-06-23
merge-tree: provide a list of which files have conflicts
Elijah Newren
2022-06-23
merge-tree: support including merge messages in output
Elijah Newren
2022-06-23
merge-tree: implement real merges
Elijah Newren
2022-06-23
merge-tree: add option parsing and initial shell for real merge function
Elijah Newren
2022-06-23
merge-tree: move logic for existing merge into new function
Elijah Newren
2022-06-23
merge-tree: rename merge_trees() to trivial_merge_trees()
Elijah Newren
2021-05-11
xdiff users: use designated initializers for out_line
Ævar Arnfjörð Bjarmason
2020-10-20
merge-base, xdiff: zero out xpparam_t structures
Michał Kępień
2019-08-22
Merge branch 'jk/tree-walk-overflow'
Junio C Hamano
2019-08-01
tree-walk: add a strbuf wrapper for make_traverse_path()
Jeff King
2019-08-01
tree-walk: accept a raw length for traverse_path_len()
Jeff King
2019-07-31
tree-walk: drop oid from traverse_info
Jeff King
2019-07-31
setup_traverse_info(): stop copying oid
Jeff King
2019-06-27
tree-walk.c: remove the_repo from fill_tree_descriptor()
Nguyễn Thái Ngọc Duy
2019-02-07
Merge branch 'nd/the-index-final'
Junio C Hamano
2019-01-29
Merge branch 'bc/tree-walk-oid'
Junio C Hamano
2019-01-24
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
Nguyễn Thái Ngọc Duy
2019-01-15
tree-walk: store object_id in a separate member
brian m. carlson
2018-11-19
tree-walk.c: make tree_entry_interesting() take an index
Nguyễn Thái Ngọc Duy
2018-11-13
Merge branch 'jk/xdiff-interface'
Junio C Hamano
2018-11-02
xdiff: provide a separate emit callback for hunks
Jeff King
2018-10-19
Merge branch 'nd/the-index'
Junio C Hamano
2018-09-21
merge-blobs.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
2018-06-29
blob: add repository argument to lookup_blob
Stefan Beller
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
2018-05-16
object-store: move object access functions to object-store.h
Stefan Beller
2018-04-11
exec_cmd: rename to use dash in file name
Stefan Beller
2018-03-14
sha1_file: convert read_sha1_file to struct object_id
brian m. carlson
2017-08-14
tree-walk: convert fill_tree_descriptor() to object_id
René Scharfe
2017-07-17
builtin/merge-tree: convert remaining caller of get_sha1 to object_id
brian m. carlson
2017-05-08
Convert lookup_blob to struct object_id
brian m. carlson
2017-05-08
Convert remaining callers of lookup_blob to object_id
brian m. carlson
2016-04-26
struct name_entry: use struct object_id instead of unsigned char sha1[20]
brian m. carlson
2016-02-23
use xmallocz to avoid size arithmetic
Jeff King
2015-11-20
Remove get_object_hash.
brian m. carlson
2015-11-20
Convert struct object to object_id
brian m. carlson
2015-11-20
Add several uses of get_object_hash.
brian m. carlson
2015-09-29
react to errors in xdi_diff
Jeff King
2014-09-02
merge-tree: remove unused df_conflict arguments
René Scharfe
2013-05-07
merge-tree: handle directory/empty conflict correctly
John Keeping
2013-04-28
merge-tree: fix typo in "both changed identically"
John Keeping
2013-04-08
merge-tree: don't print entries that match "local"
John Keeping
2013-03-27
merge-tree: fix typo in merge-tree.c::unresolved
John Keeping
2012-12-27
merge-tree: fix d/f conflicts
Junio C Hamano
2012-12-27
merge-tree: add comments to clarify what these functions are doing
Junio C Hamano
[next]