| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 |
| |\ | |||
| | * | git diff too slow for a file | René Scharfe | 2010-05-02 |
| * | | merge_file(): add comment explaining behavior wrt conflict style | Jonathan Nieder | 2010-03-20 |
| * | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
| |/ | |||
| * | merge-tree: use ll_merge() not xdl_merge() | Junio C Hamano | 2010-01-16 |
| * | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 |
| * | Always initialize xpparam_t to 0 | Brian Downing | 2008-10-25 |
| * | xdl_diff: identify call sites. | Junio C Hamano | 2007-12-13 |
| * | Future-proof source for changes in xdemitconf_t | Johannes Schindelin | 2007-07-06 |
| * | convert object type handling from a string to a number | Nicolas Pitre | 2007-02-27 |
| * | Get rid of the dependency on RCS' merge program | Johannes Schindelin | 2006-12-12 |
| * | Replace uses of strdup with xstrdup. | Shawn Pearce | 2006-09-02 |
| * | Improved three-way blob merging code | Linus Torvalds | 2006-06-28 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/merge-file.c