| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2019-08-19 | Ensure index matches head before invoking merge machinery, round N | Elijah Newren | 1 | -0/+4 |
| 2019-02-06 | Merge branch 'nd/the-index-final' | Junio C Hamano | 1 | -1/+1 |
| 2019-01-14 | merge-recursive.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
| 2019-01-11 | merge-recursive: copy $GITHEAD strings | Jeff King | 1 | -5/+10 |
| 2018-07-16 | builtin/merge-recursive: make hash independent | brian m. carlson | 1 | -2/+2 |
| 2016-09-15 | i18n: merge-recursive: mark verbose message for translation | Vasco Almeida | 1 | -1/+1 |
| 2016-09-15 | i18n: merge-recursive: mark error messages for translation | Vasco Almeida | 1 | -7/+10 |
| 2016-06-28 | merge-recursive: convert merge_recursive_generic() to object_id | brian m. carlson | 1 | -10/+10 |
| 2015-09-25 | convert trivial sprintf / strcpy calls to xsnprintf | Jeff King | 1 | -1/+1 |
| 2013-12-05 | replace {pre,suf}fixcmp() with {starts,ends}_with() | Christian Couder | 1 | -2/+2 |
| 2011-03-22 | Fix sparse warnings | Stephen Boyd | 1 | -1/+1 |
| 2010-10-26 | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 1 | -13/+2 |
| 2010-09-03 | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 1 | -0/+4 |
| 2010-09-03 | builtin/merge_recursive.c: Add an usage string and make use of it. | Thiago Farina | 1 | -1/+4 |
| 2010-08-26 | merge-recursive --patience | Justin Frankel | 1 | -0/+1 |
| 2010-08-26 | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 1 | -13/+1 |
| 2010-08-06 | merge-recursive --renormalize | Jonathan Nieder | 1 | -0/+4 |
| 2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -0/+84 |
