summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* builtin/merge-file.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-5/+5
* Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-301-0/+3
|\
| * merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-291-0/+3
* | Sync with 2.3.10Junio C Hamano2015-09-281-1/+2
|\ \
| * | merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
* | | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-221-1/+2
|\ \ \ | |/ /
| * | merge-file: correctly open files when in a subdirab/merge-file-prefixAleksander Boruch-Gruszecki2015-02-111-1/+2
| |/
* | standardize usage info string formatAlex Henrie2015-01-141-2/+2
|/
* Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-1/+1
* i18n: merge-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-10/+10
* remove superfluous newlines in error messagesPete Wyckoff2012-04-301-2/+2
* Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-241-1/+1
|\
| * Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-151-1/+1
| * add description parameter to OPT__QUIETRené Scharfe2010-11-151-1/+1
* | merge-file: correctly find files when called in subdirThomas Rast2010-10-181-1/+6
|/
* merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+1
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
* merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-201-0/+1
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-201-2/+3
* Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-201-9/+14
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+96