summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-032-2/+2
* unpack_trees: group error messages by typeMatthieu Moy2010-08-112-0/+2
* merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-112-2/+2
* Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-112-2/+2
* Merge branch 'jl/add-n-ignore-missing'Junio C Hamano2010-07-191-4/+12
|\
| * git add: Add the "--ignore-missing" option for the dry runJens Lehmann2010-07-121-4/+12
* | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-161-13/+0
* | Merge branch 'wp/merge-tree-fix'Junio C Hamano2010-07-151-1/+2
|\ \
| * | merge-tree: fix where two branches share no changesWill Palmer2010-07-141-1/+2
* | | Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-151-1/+1
|\ \ \
| * | | MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-141-1/+1
| |/ /
* | | Merge branch 'jc/diff-merge-base-multi'Junio C Hamano2010-07-151-8/+23
* | | Merge branch 'jn/grep-open'Junio C Hamano2010-07-151-0/+1
|\ \ \
| * | | grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy2010-07-071-0/+1
* | | | Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano2010-07-151-5/+11
|\ \ \ \
| * | | | do not write out index when status does not have toJunio C Hamano2010-07-061-5/+11
* | | | | Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano2010-07-081-5/+0
| |_|_|/ |/| | |
* | | | Merge branch 'maint'Junio C Hamano2010-07-071-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2010-07-071-2/+2
| * | | Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2010-07-071-37/+91
| |/ /
* | | Merge branch 'ar/decorate-color'Junio C Hamano2010-06-301-0/+3
|\ \ \
| * | | Allow customizable commit decorations colorsNazri Ramliy2010-06-241-0/+3
* | | | Merge branch 'cc/cherry-pick-stdin'Junio C Hamano2010-06-301-17/+18
|\ \ \ \
| * | | | revert: do not rebuild argv on heapJonathan Nieder2010-06-291-16/+16
| * | | | revert: accept arbitrary rev-list optionsChristian Couder2010-06-251-1/+2
* | | | | Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-301-1/+6
|\ \ \ \ \
| * | | | | Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-251-1/+6
* | | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-06-301-26/+95
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips2010-06-2715-82/+82
| |\ \ \ \ \
| * | | | | | grep -O: allow optional argument specifying the pager (or editor)Johannes Schindelin2010-06-131-14/+12
| * | | | | | grep: Add the option '--open-files-in-pager'Johannes Schindelin2010-06-131-0/+73
| * | | | | | Unify code paths of threaded grepsJohannes Schindelin2010-06-131-17/+5
| * | | | | | grep: refactor grep_objects loop into its own functionJonathan Nieder2010-06-131-10/+20
* | | | | | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-3014-79/+79
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-279-52/+52
| * | | | | | string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-273-4/+4
| * | | | | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-278-13/+13
| * | | | | | string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-273-10/+10
| |/ / / / /
* | | | | | Merge branch 'tr/rev-list-count'Junio C Hamano2010-06-301-0/+16
|\ \ \ \ \ \
| * | | | | | rev-list: introduce --count optionThomas Rast2010-06-121-0/+16
* | | | | | | Merge branch 'maint'Junio C Hamano2010-06-281-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | notes: check number of parameters to "git notes copy"Jeff King2010-06-281-0/+4
* | | | | | | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-272-8/+38
|\ \ \ \ \ \ \
| * | | | | | | textconv: support for cat_fileClément Poulain2010-06-182-8/+38
* | | | | | | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-13/+72
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | textconv: support for blameAxel Bonnet2010-06-181-13/+72
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2010-06-251-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-241-1/+1
| * | | | | | Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-221-4/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano2010-06-221-0/+7
| |\ \ \ \ \ \ \