summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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-241-1/+1
| * ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICTJeff King2012-05-245-8/+7
| * format-patch: use GIT_COMMITTER_EMAIL in message idsJeff King2012-05-241-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
| * | | cmd_fetch_pack(): declare dest to be constMichael Haggerty2012-05-221-3/+4
* | | | Merge branch 'ng/pack-objects-cleanup'Junio C Hamano2012-05-291-151/+173
|\ \ \ \
| * | | | pack-objects: refactor write_object() into helper functionsNguyễn Thái Ngọc Duy2012-05-181-150/+172
| * | | | pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."Nguyễn Thái Ngọc Duy2012-05-181-1/+1
* | | | | Merge branch 'ap/checkout-no-progress-for-non-tty'Junio C Hamano2012-05-251-2/+2
|\ \ \ \ \
| * | | | | checkout: no progress messages if !isatty(2).Avery Pennarun2012-05-241-2/+2
* | | | | | Merge branch 'rs/maint-grep-F'Junio C Hamano2012-05-251-5/+2
|\ \ \ \ \ \
| * | | | | | grep: stop leaking line strings with -fRené Scharfe2012-05-211-5/+2
* | | | | | | Sync with 1.7.10.3Junio C Hamano2012-05-251-3/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | fmt-merge-message: add empty line between tag and signature verificationLinus Torvalds2012-05-251-3/+5
| * | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-241-68/+67
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintJunio C Hamano2012-05-141-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ef/checkout-empty' into maintJunio C Hamano2012-05-141-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/checkout-detach-count' into maintJunio C Hamano2012-05-141-6/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ef/maint-clone-progress-fix' into maintJunio C Hamano2012-05-141-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-111-5/+55
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-112-49/+65
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2012-05-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/fix-missing-va-end-in-revert' into maintJunio C Hamano2012-05-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress' into maintJunio C Hamano2012-05-101-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | remote: fix typoRalf Thielow2012-05-201-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'nd/i18n-parseopt'Junio C Hamano2012-05-171-31/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-05-081-31/+31
* | | | | | | | | | | | | | | | Merge branch 'rs/xdiff-lose-emit-func'Junio C Hamano2012-05-171-22/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | builtin/blame.c: Fix a "Using plain integer as NULL pointer" warningRamsay Jones2012-05-141-1/+1
| * | | | | | | | | | | | | | | | blame: factor out helper for calling xdi_diff()René Scharfe2012-05-091-22/+16
| * | | | | | | | | | | | | | | | blame: use hunk_func(), part 2René Scharfe2012-05-091-5/+13
| * | | | | | | | | | | | | | | | blame: use hunk_func(), part 1René Scharfe2012-05-091-5/+12
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'nd/threaded-index-pack'Junio C Hamano2012-05-141-66/+275
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | index-pack: disable threading if NO_PREAD is definedNguyễn Thái Ngọc Duy2012-05-071-0/+5
| * | | | | | | | | | | | | | | index-pack: support multithreaded delta resolvingNguyễn Thái Ngọc Duy2012-05-071-11/+193
| * | | | | | | | | | | | | | | index-pack: restructure pack processing into three main functionsNguyễn Thái Ngọc Duy2012-05-071-53/+75