aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
Commit message (Expand)AuthorAge
* Sync with 2.3.10Junio C Hamano2015-09-28
|\
| * merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-28
* | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-22
|\ \ | |/
| * merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki2015-02-11
* | standardize usage info string formatAlex Henrie2015-01-14
|/
* Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
* i18n: merge-file: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
* remove superfluous newlines in error messagesPete Wyckoff2012-04-30
* Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-24
|\
| * Describe various forms of "be quiet" using OPT__QUIETJonathan Nieder2010-11-15
| * add description parameter to OPT__QUIETRené Scharfe2010-11-15
* | merge-file: correctly find files when called in subdirThomas Rast2010-10-18
|/
* merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
* merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-20
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22