summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503ls/travis-relays-for-windows-ciLars Schneider2017-05-041-2/+21
* travis-ci: handle Git for Windows CI status "failed" explicitlyLars Schneider2017-05-041-1/+2
* travis-ci: build and test Git on WindowsLars Schneider2017-03-282-0/+85
* Eighth batch for 2.13Junio C Hamano2017-03-271-0/+22
* Merge branch 'km/config-grammofix'Junio C Hamano2017-03-271-3/+3
|\
| * doc/config: grammar fixes for core.{editor,commentChar}km/config-grammofixKyle Meyer2017-03-231-3/+3
* | Merge branch 'sb/t3600-rephrase'Junio C Hamano2017-03-271-1/+1
|\ \
| * | t3600: rename test to describe its functionalitysb/t3600-rephraseStefan Beller2017-03-221-1/+1
* | | Merge branch 'sb/describe-broken'Junio C Hamano2017-03-273-12/+66
|\ \ \
| * | | builtin/describe: introduce --broken flagsb/describe-brokenStefan Beller2017-03-223-12/+66
* | | | Merge branch 'sb/push-options-via-transport'Junio C Hamano2017-03-275-14/+58
|\ \ \ \
| * | | | remote-curl: allow push optionssb/push-options-via-transportBrandon Williams2017-03-224-2/+50
| * | | | send-pack: send push options correctly in stateless-rpc caseBrandon Williams2017-03-221-12/+8
* | | | | Merge branch 'km/t1400-modernization'Junio C Hamano2017-03-271-76/+78
|\ \ \ \ \
| * | | | | t1400: use test_when_finished for cleanupKyle Meyer2017-03-211-40/+41
| * | | | | t1400: remove a set of unused output filesKyle Meyer2017-03-211-2/+2
| * | | | | t1400: use test_path_is_* helpersKyle Meyer2017-03-211-22/+22
| * | | | | t1400: set core.logAllRefUpdates in "logged by touch" testsKyle Meyer2017-03-211-11/+12
| * | | | | t1400: rename test descriptions to be uniqueKyle Meyer2017-03-211-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/prefix-filename'Junio C Hamano2017-03-2717-75/+86
|\ \ \ \ \
| * | | | | bundle: use prefix_filename with bundle pathjk/prefix-filenameJeff King2017-03-211-7/+1
| * | | | | prefix_filename: simplify windows #ifdefJeff King2017-03-211-9/+6
| * | | | | prefix_filename: return newly allocated stringJeff King2017-03-2115-39/+51
| * | | | | prefix_filename: drop length parameterJeff King2017-03-2115-35/+23
| * | | | | prefix_filename: move docstring to header fileJeff King2017-03-212-5/+12
| * | | | | hash-object: fix buffer reuse with --path in a subdirectoryJeff King2017-03-212-2/+15
| |/ / / /
* | | | | Merge branch 'jc/lint-runaway-here-doc'Junio C Hamano2017-03-271-3/+3
|\ \ \ \ \
| * | | | | tests: lint for run-away here-docjc/lint-runaway-here-docJunio C Hamano2017-03-231-3/+3
* | | | | | Merge branch 'st/verify-tag'Junio C Hamano2017-03-272-14/+10
|\ \ \ \ \ \
| * | | | | | t7004, t7030: fix here-doc syntax errorsst/verify-tagSantiago Torres2017-03-242-14/+10
* | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script'Junio C Hamano2017-03-271-3/+3
|\ \ \ \ \ \ \
| * | | | | | | t7406: correct test case for submodule-update initial populationsb/submodule-update-initial-runs-custom-scriptJunio C Hamano2017-03-221-3/+3
* | | | | | | | Merge branch 'jk/quote-env-path-list-component'Junio C Hamano2017-03-271-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t5615: fix a here-doc syntax errorjk/quote-env-path-list-componentJunio C Hamano2017-03-221-0/+1
* | | | | | | | | Sync with 2.12.2Junio C Hamano2017-03-243-2/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Git 2.12.2v2.12.2Junio C Hamano2017-03-243-2/+25
| * | | | | | | | | Merge branch 'ab/doc-no-option-notation-fix' into maintJunio C Hamano2017-03-242-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ab/push-default-doc-fix' into maintJunio C Hamano2017-03-241-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/commit-hook-doc-fix' into maintJunio C Hamano2017-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/config-case-cmdline-take-2' into maintJunio C Hamano2017-03-242-97/+163
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/grep-no-index-fix' into maintJunio C Hamano2017-03-242-27/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/remote-helpers-with-git-dir' into maintJunio C Hamano2017-03-244-3/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-config-parse-ignore-fix' into maintJunio C Hamano2017-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-deadlock-regression-fix' into maintJunio C Hamano2017-03-242-11/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | mailmap: use Michael J Gruber's new addressmg/mailmapMichael J Gruber2017-03-241-1/+2
* | | | | | | | | | | | | | | | | | Seventh batch for 2.13Junio C Hamano2017-03-241-9/+29
* | | | | | | | | | | | | | | | | | Merge branch 'jk/sha1dc'Junio C Hamano2017-03-249-2/+2405
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Makefile: make DC_SHA1 the defaultJunio C Hamano2017-03-171-6/+10
| * | | | | | | | | | | | | | | | | | t0013: add a basic sha1 collision detection testJeff King2017-03-173-0/+20
| * | | | | | | | | | | | | | | | | | Makefile: add DC_SHA1 knobJeff King2017-03-174-0/+47