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
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
2012-12-27
merge-tree: lose unused "resolve_directories"
Junio C Hamano
2012-12-27
merge-tree: lose unused "flags" from merge_list
Junio C Hamano
2012-12-10
Which merge_file() function do you mean?
Junio C Hamano
2011-04-11
sparse: Fix an "symbol 'merge_file' not decared" warning
Ramsay Jones
2011-03-22
Fix sparse warnings
Stephen Boyd
2010-07-14
merge-tree: fix where two branches share no changes
Will Palmer
2010-06-21
Merge branch 'rs/diff-no-minimal' into maint
Junio C Hamano
2010-02-23
Move 'builtin-*' into a 'builtin/' subdirectory
Linus Torvalds