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