summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano2016-09-194-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 'js/t6026-clean-up' into maintJunio C Hamano2016-09-191-0/+2
|\ \
| * | t6026-merge-attr: clean up background process at end of test casejs/t6026-clean-upJohannes Sixt2016-09-071-0/+2
| |/
* | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-192-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' into maintJunio C Hamano2016-09-192-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/test-lib-drop-pid-from-results' into maintJunio C Hamano2016-09-191-2/+2
|\ \ \
| * | | test-lib: drop PID from test-results/*.countjk/test-lib-drop-pid-from-resultsJeff King2016-08-301-2/+2
| |/ /
* | | Merge branch 'bh/diff-highlight-graph' into maintJunio C Hamano2016-09-195-6/+338
|\ \ \
| * | | diff-highlight: avoid highlighting combined diffsbh/diff-highlight-graphJeff King2016-08-312-1/+38
| * | | diff-highlight: add multi-byte testsJeff King2016-08-311-1/+35
| * | | diff-highlight: ignore test cruftJeff King2016-08-311-0/+2
| * | | diff-highlight: add support for --graph outputBrian Henderson2016-08-292-7/+14
| * | | diff-highlight: add failing test for handling --graph outputBrian Henderson2016-08-291-0/+62
| * | | diff-highlight: add some testsBrian Henderson2016-08-293-0/+190
* | | | Merge branch 'po/range-doc' into maintJunio C Hamano2016-09-195-51/+88
|\ \ \ \
| * | | | doc: revisions: sort examples and fix alignment of the unchangedpo/range-docPhilip Oakley2016-08-131-6/+6
| * | | | doc: revisions: show revision expansion in examplesPhilip Oakley2016-08-131-6/+17
| * | | | doc: revisions - clarify reachability examplesPhilip Oakley2016-08-131-5/+6
| * | | | doc: revisions - define `reachable`Philip Oakley2016-08-131-4/+10
| * | | | doc: gitrevisions - clarify 'latter case' is revision walkPhilip Oakley2016-08-131-2/+2
| * | | | doc: gitrevisions - use 'reachable' in page descriptionPhilip Oakley2016-08-131-2/+2
| * | | | doc: revisions: single vs multi-parent notation comparisonPhilip Oakley2016-08-131-0/+4
| * | | | doc: revisions: extra clarification of <rev>^! notation effectsPhilip Oakley2016-08-131-1/+2
| * | | | doc: revisions: give headings for the two and three dot notationsPhilip Oakley2016-08-121-22/+36
| * | | | doc: show the actual left, right, and boundary marksPhilip Oakley2016-07-201-1/+1
| * | | | doc: revisions - name the left and right sidesPhilip Oakley2016-07-201-1/+1
| * | | | doc: use 'symmetric difference' consistentlyPhilip Oakley2016-07-202-3/+3
* | | | | 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
* | | | | | Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-08303-18845/+35770
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Git 2.10v2.10.0Junio C Hamano2016-09-022-1/+6
| * | | | | Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-poJunio C Hamano2016-09-021-374/+317
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-09-021-374/+317
| | |\ \ \ \ | |/ / / / /
| | * | | | l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)Tran Ngoc Quan2016-08-281-374/+317
| * | | | | A few more fixes before the final 2.10Junio C Hamano2016-08-311-3/+8
| * | | | | Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-08-318-14691/+24337
| |\ \ \ \ \
| | * | | | | l10n: zh_CN: for git v2.10.0 l10n round 2Jiang Xin2016-08-311-1755/+2746
| | * | | | | l10n: ca.po: update translationAlex Henrie2016-08-281-2262/+3751
| | * | | | | l10n: fr.po v2.10.0-rc2Jean-Noel Avila2016-08-281-1796/+3072
| | * | | | | l10n: sv.po: Update Swedish translation (2757t0f0u)Peter Krefting2016-08-271-1791/+3043
| | |/ / / /
| | * | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-08-271-1780/+3085
| | |\ \ \ \