index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge-tree.c
Age
Commit message (
Expand
)
Author
Files
Lines
2020-10-20
merge-base, xdiff: zero out xpparam_t structures
Michał Kępień
1
-0
/
+1
2019-08-22
Merge branch 'jk/tree-walk-overflow'
Junio C Hamano
1
-2
/
+3
2019-08-01
tree-walk: add a strbuf wrapper for make_traverse_path()
Jeff King
1
-2
/
+3
2019-08-01
tree-walk: accept a raw length for traverse_path_len()
Jeff King
1
-1
/
+1
2019-07-31
tree-walk: drop oid from traverse_info
Jeff King
1
-1
/
+1
2019-07-31
setup_traverse_info(): stop copying oid
Jeff King
1
-1
/
+1
2019-06-27
tree-walk.c: remove the_repo from fill_tree_descriptor()
Nguyễn Thái Ngọc Duy
1
-9
/
+13
2019-02-06
Merge branch 'nd/the-index-final'
Junio C Hamano
1
-1
/
+3
2019-01-29
Merge branch 'bc/tree-walk-oid'
Junio C Hamano
1
-10
/
+10
2019-01-24
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
Nguyễn Thái Ngọc Duy
1
-1
/
+3
2019-01-15
tree-walk: store object_id in a separate member
brian m. carlson
1
-10
/
+10
2018-11-19
tree-walk.c: make tree_entry_interesting() take an index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-11-13
Merge branch 'jk/xdiff-interface'
Junio C Hamano
1
-1
/
+2
2018-11-02
xdiff: provide a separate emit callback for hunks
Jeff King
1
-1
/
+2
2018-10-19
Merge branch 'nd/the-index'
Junio C Hamano
1
-1
/
+1
2018-09-21
merge-blobs.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2018-08-29
convert "oidcmp() == 0" to oideq()
Jeff King
1
-1
/
+1
2018-06-29
blob: add repository argument to lookup_blob
Stefan Beller
1
-1
/
+2
2018-06-29
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
Junio C Hamano
1
-0
/
+1
2018-05-16
object-store: move object access functions to object-store.h
Stefan Beller
1
-0
/
+1
2018-04-11
exec_cmd: rename to use dash in file name
Stefan Beller
1
-1
/
+1
2018-03-14
sha1_file: convert read_sha1_file to struct object_id
brian m. carlson
1
-2
/
+3
2017-08-14
tree-walk: convert fill_tree_descriptor() to object_id
René Scharfe
1
-6
/
+6
2017-07-17
builtin/merge-tree: convert remaining caller of get_sha1 to object_id
brian m. carlson
1
-3
/
+3
2017-05-08
Convert lookup_blob to struct object_id
brian m. carlson
1
-1
/
+1
2017-05-08
Convert remaining callers of lookup_blob to object_id
brian m. carlson
1
-5
/
+5
2016-04-25
struct name_entry: use struct object_id instead of unsigned char sha1[20]
brian m. carlson
1
-9
/
+9
2016-02-22
use xmallocz to avoid size arithmetic
Jeff King
1
-1
/
+1
2015-11-20
Remove get_object_hash.
brian m. carlson
1
-2
/
+2
2015-11-20
Convert struct object to object_id
brian m. carlson
1
-1
/
+1
2015-11-20
Add several uses of get_object_hash.
brian m. carlson
1
-2
/
+2
2015-09-28
react to errors in xdi_diff
Jeff King
1
-1
/
+2
2014-09-02
merge-tree: remove unused df_conflict arguments
René Scharfe
1
-12
/
+6
2013-05-06
merge-tree: handle directory/empty conflict correctly
John Keeping
1
-1
/
+5
2013-04-28
merge-tree: fix typo in "both changed identically"
John Keeping
1
-1
/
+1
2013-04-08
merge-tree: don't print entries that match "local"
John Keeping
1
-13
/
+13
2013-03-27
merge-tree: fix typo in merge-tree.c::unresolved
John Keeping
1
-1
/
+1
2012-12-26
merge-tree: fix d/f conflicts
Junio C Hamano
1
-32
/
+40
2012-12-26
merge-tree: add comments to clarify what these functions are doing
Junio C Hamano
1
-4
/
+22
2012-12-26
merge-tree: lose unused "resolve_directories"
Junio C Hamano
1
-3
/
+0
2012-12-26
merge-tree: lose unused "flags" from merge_list
Junio C Hamano
1
-2
/
+1
2012-12-09
Which merge_file() function do you mean?
Junio C Hamano
1
-2
/
+2
2011-04-11
sparse: Fix an "symbol 'merge_file' not decared" warning
Ramsay Jones
1
-2
/
+1
2011-03-22
Fix sparse warnings
Stephen Boyd
1
-1
/
+1
2010-07-14
merge-tree: fix where two branches share no changes
Will Palmer
1
-1
/
+2
2010-06-21
Merge branch 'rs/diff-no-minimal' into maint
Junio C Hamano
1
-1
/
+1
2010-02-22
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds
1
-0
/
+358