summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano2012-07-111-6/+0
|\
| * update-index: allow overwriting existing submodule index entriesHeiko Voigt2012-06-111-6/+0
* | Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano2012-07-111-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 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-113-4/+4
|\ \ \ \
| * | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-183-4/+4
* | | | | Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-112-7/+22
|\ \ \ \ \
| * | | | | builtin/add.c: use path_excluded()Junio C Hamano2012-06-051-1/+5
| * | | | | path_excluded(): update API to less cache-entry centricJunio C Hamano2012-06-051-2/+8
| * | | | | ls-files -i: pay attention to exclusion of leading pathsJunio C Hamano2012-06-031-6/+11
* | | | | | 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-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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status