summaryrefslogtreecommitdiff
path: root/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* make "git merge-tree" a built-inLinus Torvalds2010-01-211-362/+0
* merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-161-2/+2
* Replace deprecated dashed git commands in usageAlexander Potashev2009-02-041-1/+1
* Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska2009-01-261-0/+3
* Replace xmalloc/memset(0) pairs with xcallocBrandon Casey2008-10-081-2/+1
* Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds2008-03-091-1/+1
* Add return value to 'traverse_tree()' callbackLinus Torvalds2008-03-091-4/+5
* Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds2008-03-091-24/+27
* xdl_diff: identify call sites.Junio C Hamano2007-12-131-1/+1
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-061-1/+1
* Remove "pathlen" from "struct name_entry"Linus Torvalds2007-03-211-4/+5
* convert object type handling from a string to a numberNicolas Pitre2007-02-271-4/+4
* Handle invalid argc gentlyDmitry V. Levin2006-09-141-1/+1
* Make count-objects, describe and merge-tree work in subdirectoryDmitry V. Levin2006-09-131-0/+2
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-2/+2
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-1/+1
* Improved three-way blob merging codeLinus Torvalds2006-06-281-0/+73
* Prepare "git-merge-tree" for future workLinus Torvalds2006-06-281-15/+119
* Merge branch 'fix'Junio C Hamano2006-05-081-1/+1
|\
| * Separate object name errors from usage errorsDmitry V. Levin2006-05-081-1/+1
* | sha1_to_hex() usage cleanupLinus Torvalds2006-05-031-4/+2
|/
* tree/diff header cleanup.Junio C Hamano2006-03-291-95/+1
* git-merge-tree: generalize the "traverse <n> trees in sync" functionalityLinus Torvalds2006-02-151-53/+67
* Handling large files with GITLinus Torvalds2006-02-151-10/+30
* Handling large files with GITLinus Torvalds2006-02-151-0/+238
* Remove "merge-tree.c"Linus Torvalds2005-04-161-145/+0
* [PATCH] Add '-z' to merge-tree.cJunio C Hamano2005-04-151-3/+20
* Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds2005-04-141-0/+128
View Lorry Controller Status