index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge-tree.c
Commit message (
Expand
)
Author
Age
*
Make 'traverse_trees()' traverse conflicting DF entries in parallel
Linus Torvalds
2008-03-09
*
Add return value to 'traverse_tree()' callback
Linus Torvalds
2008-03-09
*
Make 'traverse_tree()' use linked structure rather than 'const char *base'
Linus Torvalds
2008-03-09
*
xdl_diff: identify call sites.
Junio C Hamano
2007-12-13
*
Future-proof source for changes in xdemitconf_t
Johannes Schindelin
2007-07-06
*
Remove "pathlen" from "struct name_entry"
Linus Torvalds
2007-03-21
*
convert object type handling from a string to a number
Nicolas Pitre
2007-02-27
*
Handle invalid argc gently
Dmitry V. Levin
2006-09-14
*
Make count-objects, describe and merge-tree work in subdirectory
Dmitry V. Levin
2006-09-13
*
Replace uses of strdup with xstrdup.
Shawn Pearce
2006-09-02
*
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
David Rientjes
2006-08-17
*
Improved three-way blob merging code
Linus Torvalds
2006-06-28
*
Prepare "git-merge-tree" for future work
Linus Torvalds
2006-06-28
*
Merge branch 'fix'
Junio C Hamano
2006-05-08
|
\
|
*
Separate object name errors from usage errors
Dmitry V. Levin
2006-05-08
*
|
sha1_to_hex() usage cleanup
Linus Torvalds
2006-05-03
|
/
*
tree/diff header cleanup.
Junio C Hamano
2006-03-29
*
git-merge-tree: generalize the "traverse <n> trees in sync" functionality
Linus Torvalds
2006-02-15
*
Handling large files with GIT
Linus Torvalds
2006-02-15
*
Handling large files with GIT
Linus Torvalds
2006-02-15
*
Remove "merge-tree.c"
Linus Torvalds
2005-04-16
*
[PATCH] Add '-z' to merge-tree.c
Junio C Hamano
2005-04-15
*
Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.
Linus Torvalds
2005-04-14
