summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hv/submodule-update-nuke-submodules'Junio C Hamano2012-06-291-6/+0
|\
| * update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-111-6/+0
* | Merge branch 'nd/stream-pack-objects'Junio C Hamano2012-06-291-6/+67
|\ \
| * | pack-objects: use streaming interface for reading large loose blobsNguyễn Thái Ngọc Duy2012-05-291-6/+67
* | | Merge branch 'nd/stream-index-pack'Junio C Hamano2012-06-291-23/+171
|\ \ \
| * | | index-pack: use streaming interface for collision test on large blobsNguyễn Thái Ngọc Duy2012-05-241-5/+77
| * | | index-pack: factor out unpack core from get_data_from_packNguyễn Thái Ngọc Duy2012-05-231-3/+24
| * | | index-pack: use streaming interface on large blobs (most of the time)Nguyễn Thái Ngọc Duy2012-05-231-8/+44
| * | | index-pack: hash non-delta objects while reading from streamNguyễn Thái Ngọc Duy2012-05-231-11/+30
* | | | Merge branch 'mm/verify-filename-fix'Junio C Hamano2012-06-293-4/+4
|\ \ \ \
| * | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-193-4/+4
* | | | | Merge branch 'jk/diff-no-index-pager'Junio C Hamano2012-06-291-7/+17
|\ \ \ \ \
| * | | | | fix pager.diff with diff --no-indexJeff King2012-06-151-7/+17
| | |_|_|/ | |/| | |
| * | | | Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-011-5/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano2012-06-011-2/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/i18n-misc'Junio C Hamano2012-06-251-2/+4
|\ \ \ \ \ \ \
| * | | | | | | reflog: remove i18n legos in pruning messageNguyễn Thái Ngọc Duy2012-06-071-2/+4
* | | | | | | | Merge branch 'vr/help-per-platform'Junio C Hamano2012-06-221-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Restore use of 'help.format' configuration property in 'git help'Pat Thoyts2012-06-221-3/+3
* | | | | | | | | Merge branch 'vr/help-per-platform'Junio C Hamano2012-06-211-1/+7
|\| | | | | | | |
| * | | | | | | | help: use HTML as the default help format on WindowsVincent van Ravesteijn2012-06-061-1/+7
* | | | | | | | | Merge branch 'jc/ls-files-i-dir'Junio C Hamano2012-06-212-7/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/add.c: use path_excluded()Junio C Hamano2012-06-061-1/+5
| * | | | | | | | | path_excluded(): update API to less cache-entry centricJunio C Hamano2012-06-061-2/+8
| * | | | | | | | | ls-files -i: pay attention to exclusion of leading pathsJunio C Hamano2012-06-041-6/+11
* | | | | | | | | | Merge branch 'jk/version-string'Junio C Hamano2012-06-211-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | move git_version_string into version.cJeff King2012-06-031-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/clone-local'Junio C Hamano2012-06-211-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: allow --no-local to turn off local optimizationsJeff King2012-05-301-5/+5
* | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-061-2/+2
* | | | | | | | | | | | Merge branch 'js/maint-fast-export-mark-error'Junio C Hamano2012-06-121-1/+1
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | i18n: apply: split to fix a partial i18n messageJiang Xin2012-06-011-4/+12
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'jk/ident-gecos-strbuf'Junio C Hamano2012-05-296-47/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: do not use bogus email addresses in message idsJeff King2012-05-251-1/+1
| * | | | | | | | | | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-255-8/+7
| * | | | | | | | | | format-patch: use GIT_COMMITTER_EMAIL in message idsJeff King2012-05-251-1/+2
| * | | | | | | | | | format-patch: refactor get_patch_filenameJeff King2012-05-221-28/+7
| * | | | | | | | | | format-patch: use default email for generating message idsJeff King2012-05-221-8/+2
| * | | | | | | | | | fmt-merge-msg: don't use static buffer in record_personJeff King2012-05-221-4/+4
* | | | | | | | | | | Merge branch 'jk/fetch-pack-remove-dups-optim'Junio C Hamano2012-05-291-22/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch-pack: sort incoming heads list earlierJeff King2012-05-241-1/+1
| * | | | | | | | | | | fetch-pack: avoid quadratic loop in filter_refsJeff King2012-05-221-6/+13
| * | | | | | | | | | | fetch-pack: sort the list of incoming refsJeff King2012-05-221-0/+2
| * | | | | | | | | | | fetch-pack: avoid quadratic behavior in remove_duplicatesJeff King2012-05-221-15/+6
| * | | | | | | | | | | fetch-pack: sort incoming headsJeff King2012-05-221-1/+9
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/fetch-pack-constness'Junio C Hamano2012-05-291-74/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cmd_fetch_pack(): respect constness of argv parameterMichael Haggerty2012-05-221-13/+10
| * | | | | | | | | | | cmd_fetch_pack(): combine the loop termination conditionsMichael Haggerty2012-05-221-58/+55
| * | | | | | | | | | | cmd_fetch_pack(): handle non-option arguments outside of the loopMichael Haggerty2012-05-221-5/+7