summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sha1_file: use llist_mergesort() for sorting packsrs/pack-sort-with-llist-mergesortRené Scharfe2016-09-131-24/+15
* Sync with maintJunio C Hamano2016-09-123-446/+402
|\
| * Merge tag 'l10n-2.10.0-rnd2.3' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-09-123-446/+402
| |\
| | * l10n: zh_CN: review for git v2.10.0 l10nRay Chen2016-09-111-50/+50
| | * l10n: zh_CN: fixed some typos for git 2.10.0Jiang Xin2016-09-111-4/+4
| | * l10n: pt_PT: update Portuguese repository infoVasco Almeida2016-09-031-2/+3
| | * l10n: pt_PT: update Portuguese translationVasco Almeida2016-09-031-392/+347
* | | First batch for 2.11Junio C Hamano2016-09-121-0/+41
* | | Merge branch 'sb/transport-report-missing-submodule-on-stderr'Junio C Hamano2016-09-121-1/+1
|\ \ \
| * | | transport: report missing submodule pushes consistently on stderrsb/transport-report-missing-submodule-on-stderrStefan Beller2016-09-081-1/+1
* | | | Merge branch 'ep/use-git-trace-curl-in-tests'Junio C Hamano2016-09-124-9/+19
|\ \ \ \
| * | | | t5551-http-fetch-smart.sh: use the GIT_TRACE_CURL environment varep/use-git-trace-curl-in-testsElia Pinto2016-09-071-3/+12
| * | | | t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-5/+5
| * | | | test-lib.sh: preserve GIT_TRACE_CURL from the environmentElia Pinto2016-09-071-0/+1
| * | | | t5541-http-push-smart.sh: use the GIT_TRACE_CURL environment varElia Pinto2016-09-071-1/+1
| |/ / /
* | | | Merge branch 'sb/xdiff-remove-unused-static-decl'Junio C Hamano2016-09-121-9/+0
|\ \ \ \
| * | | | xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-declStefan Beller2016-09-071-9/+0
* | | | | Merge branch 'js/t6026-clean-up'Junio C Hamano2016-09-121-0/+2
|\ \ \ \ \
| * | | | | t6026-merge-attr: clean up background process at end of test casejs/t6026-clean-upJohannes Sixt2016-09-071-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'js/t9903-chaining'Junio C Hamano2016-09-121-1/+1
|\ \ \ \ \
| * | | | | t9903: fix broken && chainjs/t9903-chainingJohannes Sixt2016-09-071-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/hex2chr'Junio C Hamano2016-09-126-78/+21
|\ \ \ \ \
| * | | | | introduce hex2chr() for converting two hexadecimal digits to a characterrs/hex2chrRené Scharfe2016-09-076-78/+21
| |/ / / /
* | | | | Merge branch 'rs/compat-strdup'Junio C Hamano2016-09-124-19/+33
|\ \ \ \ \
| * | | | | compat: move strdup(3) replacement to its own filers/compat-strdupRené Scharfe2016-09-074-19/+33
| |/ / / /
* | | | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD'Junio C Hamano2016-09-122-7/+16
|\ \ \ \ \
| * | | | | symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEADJunio C Hamano2016-09-022-7/+16
| |/ / / /
* | | | | Merge branch 'jc/submodule-anchor-git-dir'Junio C Hamano2016-09-122-0/+36
|\ \ \ \ \
| * | | | | submodule: avoid auto-discovery in prepare_submodule_repo_env()jc/submodule-anchor-git-dirJunio C Hamano2016-09-012-0/+36
| |/ / / /
* | | | | Merge branch 'jk/squelch-false-warning-from-gcc-o3'Junio C Hamano2016-09-123-1/+3
|\ \ \ \ \
| * | | | | color_parse_mem: initialize "struct color" temporaryjk/squelch-false-warning-from-gcc-o3Jeff King2016-08-311-1/+1
| * | | | | error_errno: use constant return similar to error()Jeff King2016-08-312-0/+2
| |/ / / /
* | | | | Merge branch 'jk/test-lib-drop-pid-from-results'Junio C Hamano2016-09-121-2/+2
|\ \ \ \ \
| * | | | | test-lib: drop PID from test-results/*.countjk/test-lib-drop-pid-from-resultsJeff King2016-08-301-2/+2
| |/ / / /
* | | | | Merge branch 'jc/am-read-author-file'Junio C Hamano2016-09-121-58/+45
|\ \ \ \ \
| * | | | | am: refactor read_author_script()jc/am-read-author-fileJunio C Hamano2016-08-301-58/+45
* | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-1220-161/+1663
|\ \ \ \ \ \
| * | | | | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-317-21/+863
| * | | | | | submodule: refactor show_submodule_summary with helper functionJacob Keller2016-08-311-33/+82
| * | | | | | submodule: convert show_submodule_summary to use struct object_id *Jacob Keller2016-08-313-10/+10
| * | | | | | allow do_submodule_path to work even if submodule isn't checked outJacob Keller2016-08-315-11/+173
| * | | | | | diff: prepare for additional submodule formatsJacob Keller2016-08-312-7/+12
| * | | | | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-3111-80/+504
| * | | | | | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-313-4/+1
| * | | | | | cache: add empty_tree_oid object and helper functionJacob Keller2016-08-312-4/+27
* | | | | | | Sync with maintJunio C Hamano2016-09-081-0/+83
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-08303-18845/+35770
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Prepare for 2.9.4Junio C Hamano2016-09-082-1/+84
| * | | | | | Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano2016-09-081-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-081-1/+0
| |\ \ \ \ \ \ \
View Lorry Controller Status