Commit message (Expand) | Author | Age | |
---|---|---|---|
* | i18n: merge-file: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-08-20 |
* | remove superfluous newlines in error messages | Pete Wyckoff | 2012-04-30 |
* | Merge branch 'rs/opt-help-text' | Junio C Hamano | 2010-11-24 |
|\ | |||
| * | Describe various forms of "be quiet" using OPT__QUIET | Jonathan Nieder | 2010-11-15 |
| * | add description parameter to OPT__QUIET | René Scharfe | 2010-11-15 |
* | | merge-file: correctly find files when called in subdir | Thomas Rast | 2010-10-18 |
|/ | |||
* | merge-file: run setup_git_directory_gently() sooner | Nguyễn Thái Ngọc Duy | 2010-08-15 |
* | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 |
* | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2010-03-20 |
* | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 |
* | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 2010-03-20 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |