summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
AgeCommit message (Expand)Author
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt
2025-04-15object-file: split out functions relating to object store subsystemPatrick Steinhardt
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai
2023-11-22merge-file: add --diff-algorithm optionAntonin Delpeuch
2023-11-02merge-file: add an option to process object IDsbrian m. carlson
2023-06-21cache.h: remove this no-longer-used headerElijah Newren
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren
2022-07-01merge-file: fix memory leaks on error pathÆvar Arnfjörð Bjarmason
2022-07-01merge-file: refactor for subsequent memory leak fixÆvar Arnfjörð Bjarmason
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-03-21prefix_filename: return newly allocated stringJeff King
2017-03-21prefix_filename: drop length parameterJeff King
2016-05-09builtin/merge-file.c: use error_errno()Nguyễn Thái Ngọc Duy
2015-10-30Merge branch 'jk/merge-file-exit-code'Junio C Hamano
2015-10-29merge-file: clamp exit code to maximum 127Jeff King
2015-09-28Sync with 2.3.10Junio C Hamano
2015-09-28merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King
2015-02-22Merge branch 'ab/merge-file-prefix'Junio C Hamano
2015-02-11merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki
2015-01-14standardize usage info string formatAlex Henrie
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller
2012-08-20i18n: merge-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy
2012-04-30remove superfluous newlines in error messagesPete Wyckoff
2010-11-24Merge branch 'rs/opt-help-text'Junio C Hamano
2010-11-15Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder
2010-11-15add description parameter to OPT__QUIETRené Scharfe
2010-10-18merge-file: correctly find files when called in subdirThomas Rast
2010-08-15merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-03-20merge-file --diff3: add a label for ancestorJonathan Nieder
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
2010-03-20Merge branch 'bw/union-merge-refactor'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 00:14:52 +0000