aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/ll-merge-internal'Junio C Hamano2016-05-17
|\
| * ll-merge: use a longer conflict marker for internal mergeJunio C Hamano2016-05-09
| * ll-merge: fix typo in commentJunio C Hamano2016-04-14
* | use xmallocz to avoid size arithmeticJeff King2016-02-22
* | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-20
|\ \
| * | convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-25
* | | Sync with 2.4.10Junio C Hamano2015-09-28
|\ \ \ | |/ / |/| |
| * | xdiff: reject files larger than ~1GBJeff King2015-09-28
| |/
* | ll-merge: pass the original path to external driversJunio C Hamano2015-06-04
|/
* ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`Tanay Abhra2014-08-13
* convert some config callbacks to parse_config_keyJeff King2013-01-23
* Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-14
|\
| * ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano2012-09-12
| * merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-08
* | remove superfluous newlines in error messagesPete Wyckoff2012-04-30
|/
* Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-04
* ll-merge: simplify opts == NULL caseJonathan Nieder2011-01-15
* merge-recursive --patienceJustin Frankel2010-08-26
* ll-merge: replace flag argument with options structJonathan Nieder2010-08-26
* ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
* ll-merge: make flag easier to populateJonathan Nieder2010-08-06
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-02
* Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-31
* ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* refactor merge flags into xmparam_tBert Wesarg2010-03-02
* make union merge an xdl merge favorBert Wesarg2010-03-02
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-17
| * conflict-marker-size: new attributeJunio C Hamano2010-01-16
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
| * git_attr(): fix function signatureJunio C Hamano2010-01-16
* | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\ \
| * | git merge -X<option>Avery Pennarun2010-01-17
| |/
* | run-command: convert simple callsites to use_shellJeff King2010-01-05
|/
* Merge branch 'js/run-command-updates'Junio C Hamano2009-08-10
|\
| * run_command: return exit code as positive valueJohannes Sixt2009-07-05
* | Merge branch 'tr/die_errno'Junio C Hamano2009-07-06
|\ \ | |/ |/|
| * Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-27
* | Remove filename from conflict markersMartin Renold2009-07-01
* | Merge branch 'sb/maint-1.6.0-add-config-fix'Junio C Hamano2009-06-20
|\ \
| * | use xstrdup, not strdup in ll-merge.cJim Meyering2009-06-14
* | | Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt2009-06-09
| |/ |/|
* | replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-29
* | merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-23
* | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-30
|/
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18