summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
AgeCommit message (Expand)Author
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-16merge-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-21merge-file --diff3: add a label for ancestorJonathan Nieder
2010-03-21xdl_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