| Commit message (Expand) | Author | Age |
* | Merge branch 'jc/ll-merge-binary-ours' | Junio C Hamano | 2012-09-14 |
|\ |
|
| * | ll-merge: warn about inability to merge binary files only when we can't | Junio C Hamano | 2012-09-12 |
| * | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 |
* | | remove superfluous newlines in error messages | Pete Wyckoff | 2012-04-30 |
|/ |
|
* | Rename git_checkattr() to git_check_attr() | Michael Haggerty | 2011-08-04 |
* | ll-merge: simplify opts == NULL case | Jonathan Nieder | 2011-01-15 |
* | merge-recursive --patience | Justin Frankel | 2010-08-26 |
* | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 |
* | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 |
* | ll-merge: make flag easier to populate | Jonathan Nieder | 2010-08-06 |
* | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
* | Rewrite dynamic structure initializations to runtime assignment | Gary V. Vaughan | 2010-05-31 |
* | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
* | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 |
* | refactor merge flags into xmparam_t | Bert Wesarg | 2010-03-02 |
* | make union merge an xdl merge favor | Bert Wesarg | 2010-03-02 |
* | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 |
|\ |
|
| * | rerere: honor conflict-marker-size attribute | Junio C Hamano | 2010-01-17 |
| * | conflict-marker-size: new attribute | Junio C Hamano | 2010-01-16 |
| * | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 |
| * | git_attr(): fix function signature | Junio C Hamano | 2010-01-16 |
* | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
|\ \ |
|
| * | | git merge -X<option> | Avery Pennarun | 2010-01-17 |
| |/ |
|
* | | run-command: convert simple callsites to use_shell | Jeff King | 2010-01-05 |
|/ |
|
* | Merge branch 'js/run-command-updates' | Junio C Hamano | 2009-08-10 |
|\ |
|
| * | run_command: return exit code as positive value | Johannes Sixt | 2009-07-05 |
* | | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 |
|\ \
| |/
|/| |
|
| * | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 |
* | | Remove filename from conflict markers | Martin Renold | 2009-07-01 |
* | | Merge branch 'sb/maint-1.6.0-add-config-fix' | Junio C Hamano | 2009-06-20 |
|\ \ |
|
| * | | use xstrdup, not strdup in ll-merge.c | Jim Meyering | 2009-06-14 |
* | | | Simplify some instances of run_command() by using run_command_v_opt(). | Johannes Sixt | 2009-06-09 |
| |/
|/| |
|
* | | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 |
* | | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe | 2008-11-23 |
* | | git-merge-recursive: learn to honor merge.conflictstyle | Junio C Hamano | 2008-08-30 |
|/ |
|
* | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 |
* | merge-recursive: split low-level merge functions out. | Junio C Hamano | 2008-02-18 |