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