summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* pack-objects: use reachability bitmap index when generating non-stdout packks/pack-objects-bitmapKirill Smelkov2016-09-121-7/+24
* pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is ...Kirill Smelkov2016-09-121-33/+64
* pack-objects: compute local/ignore_pack_keep earlyjk/pack-objects-optimJeff King2016-07-291-1/+25
* pack-objects: break out of want_object loop earlyJeff King2016-07-291-0/+16
* Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-191-8/+8
|\
| * am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
* | Merge branch 'jk/write-file'Junio C Hamano2016-07-194-60/+17
|\ \
| * | branch: use write_file_buf instead of write_filejk/write-fileJeff King2016-07-081-1/+1
| * | use write_file_buf where applicableJeff King2016-07-082-46/+6
| * | branch: use non-gentle write_file for branch descriptionJeff King2016-07-081-4/+1
| * | am: ignore return value of write_file()René Scharfe2016-07-081-9/+9
| * | config: fix bogus fd check when setting up default configJeff King2016-07-081-1/+1
* | | Merge branch 'jk/printf-format'Junio C Hamano2016-07-191-1/+1
|\ \ \
| * | | avoid using sha1_to_hex output as printf formatJeff King2016-07-081-1/+1
* | | | Merge branch 'nd/fetch-ref-summary'Junio C Hamano2016-07-191-40/+157
|\ \ \ \
| * | | | fetch: reduce duplicate in ref update status lines with placeholderNguyễn Thái Ngọc Duy2016-07-061-1/+76
| * | | | fetch: align all "remote -> local" outputNguyễn Thái Ngọc Duy2016-07-061-2/+45
| * | | | fetch: change flag code for displaying tag update and deleted refNguyễn Thái Ngọc Duy2016-06-271-2/+2
| * | | | fetch: refactor ref update status formatting codeNguyễn Thái Ngọc Duy2016-06-271-39/+38
| | |/ / | |/| |
* | | | Merge branch 'bc/cocci'Junio C Hamano2016-07-196-30/+29
|\ \ \ \
| * | | | merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-281-10/+10
| * | | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-283-10/+10
| * | | | coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-281-7/+6
| * | | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-282-3/+3
| |/ / /
* | | | Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-192-44/+58
|\ \ \ \
| * | | | shortlog: respect the --output=<file> settingJohannes Schindelin2016-06-241-1/+3
| * | | | format-patch: use stdout directlyJohannes Schindelin2016-06-241-5/+1
| * | | | format-patch: avoid freopen()Johannes Schindelin2016-06-241-31/+33
| * | | | format-patch: explicitly switch off color when writing to filesJohannes Schindelin2016-06-241-0/+2
| * | | | shortlog: support outputting to streams other than stdoutJohannes Schindelin2016-06-241-5/+8
| * | | | log: prepare log/log-tree to reuse the diffopt.close_file attributeJohannes Schindelin2016-06-241-3/+12
* | | | | Merge branch 'dk/blame-move-no-reason-for-1-line-context'Junio C Hamano2016-07-191-4/+3
|\ \ \ \ \
| * | | | | blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-contextDavid Kastrup2016-05-291-4/+3
* | | | | | Merge branch 'nd/ita-cleanup'Junio C Hamano2016-07-131-2/+2
|\ \ \ \ \ \
| * | | | | | grep: fix grepping for "intent to add" filesnd/ita-cleanupCharles Bailey2016-07-011-2/+2
* | | | | | | Merge branch 'ew/gc-auto-pack-limit-fix'Junio C Hamano2016-07-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | gc: fix off-by-one error with gc.autoPackLimitew/gc-auto-pack-limit-fixEric Wong2016-06-271-1/+1
* | | | | | | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-139-46/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: branch: mark comment when editing branch description for translationVasco Almeida2016-06-171-3/+3
| * | | | | | | | i18n: init-db: join message piecesVasco Almeida2016-06-171-7/+10
| * | | | | | | | i18n: remote: allow translations to reorder messageVasco Almeida2016-06-171-4/+3
| * | | | | | | | i18n: remote: mark URL fallback text for translationVasco Almeida2016-06-171-3/+3
| * | | | | | | | i18n: standardise messagesVasco Almeida2016-06-173-7/+7
| * | | | | | | | i18n: merge: change command option help to lowercaseVasco Almeida2016-06-171-1/+1
| * | | | | | | | i18n: merge: mark messages for translationVasco Almeida2016-06-171-5/+5
| * | | | | | | | i18n: notes: mark options for translationVasco Almeida2016-06-171-2/+2
| * | | | | | | | i18n: notes: mark strings for translationVasco Almeida2016-06-171-10/+10
| * | | | | | | | i18n: advice: internationalize message for conflictsVasco Almeida2016-06-171-1/+1
| * | | | | | | | i18n: builtin/remote.c: fix mark for translationVasco Almeida2016-06-171-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mj/log-show-signature-conf'Junio C Hamano2016-07-111-0/+6
|\ \ \ \ \ \ \ \