summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| * | | | | | Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-221-6/+4
| * | | | | | Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-221-34/+41
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-222-36/+60
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ph/clone-message-reword' into maintJunio C Hamano2010-06-221-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-221-7/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-5/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-214-4/+4
| * | | | | | | | | | | Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-211-6/+6
* | | | | | | | | | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-221-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-161-3/+15
* | | | | | | | | | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-221-41/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | revert: allow cherry-picking more than one commitChristian Couder2010-06-021-10/+41
| * | | | | | | | | | | | | revert: change help_msg() to take no argumentChristian Couder2010-06-021-4/+4
| * | | | | | | | | | | | | revert: refactor code into a do_pick_commit() functionChristian Couder2010-06-021-19/+25
| * | | | | | | | | | | | | revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder2010-06-021-2/+9
| * | | | | | | | | | | | | revert: cleanup code for -x optionChristian Couder2010-06-021-7/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'cc/maint-commit-reflog-msg'Junio C Hamano2010-06-211-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-131-4/+9
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/maint-advice-empty-amend'Junio C Hamano2010-06-211-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | commit: give advice on empty amendJeff King2010-06-111-0/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'sm/branch-broken-ref'Junio C Hamano2010-06-211-6/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: don't fail listing branches if one of the commits wasn't foundSimo Melenius2010-06-071-1/+4
| * | | | | | | | | | | branch: exit status now reflects if branch listing finds an errorSimo Melenius2010-06-071-6/+19
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tc/commit-abbrev-fix'Junio C Hamano2010-06-211-6/+4
* | | | | | | | | | | Merge branch 'tr/receive-pack-aliased-update-fix'Junio C Hamano2010-06-211-2/+2
View Lorry Controller Status