summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use COPY_ARRAYrs/copy-arrayRené Scharfe2016-09-256-9/+32
* add COPY_ARRAYRené Scharfe2016-09-251-0/+8
* Merge branch 'bc/cocci'Junio C Hamano2016-07-1925-283/+403
|\
| * diff: convert prep_temp_blob() to struct object_idbc/coccibrian m. carlson2016-06-281-4/+4
| * merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-283-20/+20
| * merge-recursive: convert leaf functions to use struct object_idbrian m. carlson2016-06-281-118/+118
| * merge-recursive: convert struct merge_file_info to object_idbrian m. carlson2016-06-281-19/+20
| * merge-recursive: convert struct stage_data to use object_idbrian m. carlson2016-06-281-20/+18
| * diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-286-25/+25
| * diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-2813-128/+147
| * coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-283-10/+9
| * coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-285-6/+6
| * contrib/coccinelle: add basic Coccinelle transformsbrian m. carlson2016-06-282-0/+97
| * hex: add oid_to_hex_r()brian m. carlson2016-06-282-0/+6
* | Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-199-107/+144
|\ \
| * | mingw: fix the shortlog --output=<file> testjs/log-to-diffopt-fileJohannes Schindelin2016-07-111-2/+2
| * | diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin2016-06-281-0/+2
| * | t4211: ensure that log respects --output=<file>Johannes Schindelin2016-06-241-0/+7
| * | shortlog: respect the --output=<file> settingJohannes Schindelin2016-06-242-1/+9
| * | 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-242-5/+9
| * | graph: respect the diffopt.file settingJohannes Schindelin2016-06-241-13/+17
| * | line-log: respect diffopt's configured output file streamJohannes Schindelin2016-06-241-17/+17
| * | log-tree: respect diffopt's configured output file streamJohannes Schindelin2016-06-241-32/+32
| * | log: prepare log/log-tree to reuse the diffopt.close_file attributeJohannes Schindelin2016-06-242-4/+16
* | | Merge branch 'sb/submodule-parallel-fetch'Junio C Hamano2016-07-191-16/+27
|\ \ \
| * | | hoist out handle_nonblock function for xread and xwritesb/submodule-parallel-fetchEric Wong2016-07-111-28/+20
| * | | xwrite: poll on non-blocking FDsEric Wong2016-06-271-2/+20
| * | | xread: retry after poll on EAGAIN/EWOULDBLOCKEric Wong2016-06-271-0/+1
* | | | Merge branch 'lf/recv-sideband-cleanup'Junio C Hamano2016-07-191-74/+58
|\ \ \ \
| * | | | sideband.c: small optimization of strbuf usagelf/recv-sideband-cleanupNicolas Pitre2016-07-061-3/+3
| * | | | sideband.c: refactor recv_sideband()Lukas Fleischer2016-07-011-74/+58
* | | | | 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/connect-ssh-command-config'Junio C Hamano2016-07-192-1/+21
|\ \ \ \ \ \
| * | | | | | connect: read $GIT_SSH_COMMAND from config filend/connect-ssh-command-configNguyễn Thái Ngọc Duy2016-07-062-1/+21
| | |_|_|_|/ | |/| | | |
* | | | | | archive-tar: huge offset and future timestamps would not work on 32-bitJunio C Hamano2016-07-152-6/+11
* | | | | | Sync with 2.9.2Junio C Hamano2016-07-155-4/+33
|\ \ \ \ \ \
| * | | | | | Git 2.9.2v2.9.2Junio C Hamano2016-07-154-3/+17
| * | | | | | Merge branch 'jk/tzoffset-fix' into maintJunio C Hamano2016-07-153-3/+18
| |\ \ \ \ \ \
| | * | | | | | t0006: skip "far in the future" test when unsigned long is not long enoughjk/tzoffset-fixJeff King2016-07-153-3/+18
* | | | | | | | Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-141-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: fix regression in t1308-config-setjk/upload-pack-hookJohannes Schindelin2016-07-141-1/+9
* | | | | | | | | Fifth batch of topics for 2.10Junio C Hamano2016-07-131-19/+40
* | | | | | | | | Merge branch 'jk/big-and-future-archive-tar'Junio C Hamano2016-07-136-30/+138
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | archive-tar: drop return valueJeff King2016-07-011-7/+4
| * | | | | | | | | archive-tar: write extended headers for far-future mtimeJeff King2016-07-012-5/+18
| * | | | | | | | | archive-tar: write extended headers for file sizes >= 8GBJeff King2016-07-012-4/+31
View Lorry Controller Status