summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
AgeCommit message (Expand)AuthorFilesLines
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Libravatar Phillip Wood1-0/+2
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksLibravatar Jeff King1-0/+2
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-03-21prefix_filename: return newly allocated stringLibravatar Jeff King1-3/+11
2017-03-21prefix_filename: drop length parameterLibravatar Jeff King1-6/+2
2016-05-09builtin/merge-file.c: use error_errno()Libravatar Nguyễn Thái Ngọc Duy1-5/+5
2015-10-30Merge branch 'jk/merge-file-exit-code'Libravatar Junio C Hamano1-0/+3
2015-10-29merge-file: clamp exit code to maximum 127Libravatar Jeff King1-0/+3
2015-09-28Sync with 2.3.10Libravatar Junio C Hamano1-1/+2
2015-09-28merge-file: enforce MAX_XDIFF_SIZE on incoming filesLibravatar Jeff King1-1/+2
2015-02-22Merge branch 'ab/merge-file-prefix'Libravatar Junio C Hamano1-1/+2
2015-02-11merge-file: correctly open files when in a subdirLibravatar Aleksander Boruch-Gruszecki1-1/+2
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-2/+2
2013-08-05Replace deprecated OPT_BOOLEAN by OPT_BOOLLibravatar Stefan Beller1-1/+1
2012-08-20i18n: merge-file: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-10/+10
2012-04-30remove superfluous newlines in error messagesLibravatar Pete Wyckoff1-2/+2
2010-11-24Merge branch 'rs/opt-help-text'Libravatar Junio C Hamano1-1/+1
2010-11-15Describe various forms of "be quiet" using OPT__QUIETLibravatar Jonathan Nieder1-1/+1
2010-11-15add description parameter to OPT__QUIETLibravatar René Scharfe1-1/+1
2010-10-18merge-file: correctly find files when called in subdirLibravatar Thomas Rast1-1/+6
2010-08-15merge-file: run setup_git_directory_gently() soonerLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano1-1/+1
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder1-0/+1
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureLibravatar Jonathan Nieder1-2/+3
2010-03-20Merge branch 'bw/union-merge-refactor'Libravatar Junio C Hamano1-9/+14
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+96
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 11:06:47 +0000