summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)AuthorFilesLines
2013-01-23convert some config callbacks to parse_config_keyLibravatar Jeff King1-9/+5
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Libravatar Junio C Hamano1-8/+24
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tLibravatar Junio C Hamano1-3/+4
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverLibravatar Junio C Hamano1-5/+20
2012-04-30remove superfluous newlines in error messagesLibravatar Pete Wyckoff1-1/+1
2011-08-04Rename git_checkattr() to git_check_attr()Libravatar Michael Haggerty1-2/+2
2011-01-15ll-merge: simplify opts == NULL caseLibravatar Jonathan Nieder1-6/+3
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+1
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-17/+33
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-3/+3
2010-08-06ll-merge: make flag easier to populateLibravatar Jonathan Nieder1-4/+5
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+15
2010-05-31Rewrite dynamic structure initializations to runtime assignmentLibravatar Gary V. Vaughan1-7/+7
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-9/+11
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder1-1/+3
2010-03-02refactor merge flags into xmparam_tLibravatar Bert Wesarg1-8/+4
2010-03-02make union merge an xdl merge favorLibravatar Bert Wesarg1-38/+5
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-28/+53
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-12/+13
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-12/+13
2010-01-17rerere: honor conflict-marker-size attributeLibravatar Junio C Hamano1-0/+15
2010-01-16conflict-marker-size: new attributeLibravatar Junio C Hamano1-25/+34
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano1-3/+3
2010-01-16git_attr(): fix function signatureLibravatar Junio C Hamano1-1/+1
2010-01-05run-command: convert simple callsites to use_shellLibravatar Jeff King1-3/+3
2009-08-10Merge branch 'js/run-command-updates'Libravatar Junio C Hamano1-4/+0
2009-07-06Merge branch 'tr/die_errno'Libravatar Junio C Hamano1-1/+1
2009-07-05run_command: return exit code as positive valueLibravatar Johannes Sixt1-4/+0
2009-07-01Remove filename from conflict markersLibravatar Martin Renold1-4/+4
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-1/+1
2009-06-20Merge branch 'sb/maint-1.6.0-add-config-fix'Libravatar Junio C Hamano1-4/+4
2009-06-14use xstrdup, not strdup in ll-merge.cLibravatar Jim Meyering1-4/+4
2009-06-09Simplify some instances of run_command() by using run_command_v_opt().Libravatar Johannes Sixt1-9/+2
2009-04-29replace direct calls to unlink(2) with unlink_or_warnLibravatar Alex Riesen1-1/+1
2008-11-23merge-recursive: use strbuf_expand() instead of interpolate()Libravatar René Scharfe1-12/+9
2008-08-30git-merge-recursive: learn to honor merge.conflictstyleLibravatar Junio C Hamano1-5/+13
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-2/+2
2008-02-18merge-recursive: split low-level merge functions out.Libravatar Junio C Hamano1-0/+379
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:54:35 +0000