aboutsummaryrefslogtreecommitdiff
path: root/merge-tree.c
Commit message (Expand)AuthorAge
* make "git merge-tree" a built-inLinus Torvalds2010-01-21
* merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-16
* Replace deprecated dashed git commands in usageAlexander Potashev2009-02-04
* Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska2009-01-26
* Replace xmalloc/memset(0) pairs with xcallocBrandon Casey2008-10-08
* Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds2008-03-09
* Add return value to 'traverse_tree()' callbackLinus Torvalds2008-03-09
* Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds2008-03-09
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-06
* Remove "pathlen" from "struct name_entry"Linus Torvalds2007-03-21
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* Handle invalid argc gentlyDmitry V. Levin2006-09-14
* Make count-objects, describe and merge-tree work in subdirectoryDmitry V. Levin2006-09-13
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-17
* Improved three-way blob merging codeLinus Torvalds2006-06-28
* Prepare "git-merge-tree" for future workLinus Torvalds2006-06-28
* Merge branch 'fix'Junio C Hamano2006-05-08
|\
| * Separate object name errors from usage errorsDmitry V. Levin2006-05-08
* | sha1_to_hex() usage cleanupLinus Torvalds2006-05-03
|/
* tree/diff header cleanup.Junio C Hamano2006-03-29
* git-merge-tree: generalize the "traverse <n> trees in sync" functionalityLinus Torvalds2006-02-15
* Handling large files with GITLinus Torvalds2006-02-15
* Handling large files with GITLinus Torvalds2006-02-15
* Remove "merge-tree.c"Linus Torvalds2005-04-16
* [PATCH] Add '-z' to merge-tree.cJunio C Hamano2005-04-15
* Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds2005-04-14
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 19:07:46 +0000