Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | travis-ci: build and test Git on Windows | Lars Schneider | 2017-03-28 | 2 | -0/+85 |
* | Eighth batch for 2.13 | Junio C Hamano | 2017-03-27 | 1 | -0/+22 |
* | Merge branch 'km/config-grammofix' | Junio C Hamano | 2017-03-27 | 1 | -3/+3 |
|\ | |||||
| * | doc/config: grammar fixes for core.{editor,commentChar}km/config-grammofix | Kyle Meyer | 2017-03-23 | 1 | -3/+3 |
* | | Merge branch 'sb/t3600-rephrase' | Junio C Hamano | 2017-03-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | t3600: rename test to describe its functionalitysb/t3600-rephrase | Stefan Beller | 2017-03-22 | 1 | -1/+1 |
* | | | Merge branch 'sb/describe-broken' | Junio C Hamano | 2017-03-27 | 3 | -12/+66 |
|\ \ \ | |||||
| * | | | builtin/describe: introduce --broken flagsb/describe-broken | Stefan Beller | 2017-03-22 | 3 | -12/+66 |
* | | | | Merge branch 'sb/push-options-via-transport' | Junio C Hamano | 2017-03-27 | 5 | -14/+58 |
|\ \ \ \ | |||||
| * | | | | remote-curl: allow push optionssb/push-options-via-transport | Brandon Williams | 2017-03-22 | 4 | -2/+50 |
| * | | | | send-pack: send push options correctly in stateless-rpc case | Brandon Williams | 2017-03-22 | 1 | -12/+8 |
* | | | | | Merge branch 'km/t1400-modernization' | Junio C Hamano | 2017-03-27 | 1 | -76/+78 |
|\ \ \ \ \ | |||||
| * | | | | | t1400: use test_when_finished for cleanup | Kyle Meyer | 2017-03-21 | 1 | -40/+41 |
| * | | | | | t1400: remove a set of unused output files | Kyle Meyer | 2017-03-21 | 1 | -2/+2 |
| * | | | | | t1400: use test_path_is_* helpers | Kyle Meyer | 2017-03-21 | 1 | -22/+22 |
| * | | | | | t1400: set core.logAllRefUpdates in "logged by touch" tests | Kyle Meyer | 2017-03-21 | 1 | -11/+12 |
| * | | | | | t1400: rename test descriptions to be unique | Kyle Meyer | 2017-03-21 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/prefix-filename' | Junio C Hamano | 2017-03-27 | 17 | -75/+86 |
|\ \ \ \ \ | |||||
| * | | | | | bundle: use prefix_filename with bundle pathjk/prefix-filename | Jeff King | 2017-03-21 | 1 | -7/+1 |
| * | | | | | prefix_filename: simplify windows #ifdef | Jeff King | 2017-03-21 | 1 | -9/+6 |
| * | | | | | prefix_filename: return newly allocated string | Jeff King | 2017-03-21 | 15 | -39/+51 |
| * | | | | | prefix_filename: drop length parameter | Jeff King | 2017-03-21 | 15 | -35/+23 |
| * | | | | | prefix_filename: move docstring to header file | Jeff King | 2017-03-21 | 2 | -5/+12 |
| * | | | | | hash-object: fix buffer reuse with --path in a subdirectory | Jeff King | 2017-03-21 | 2 | -2/+15 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/lint-runaway-here-doc' | Junio C Hamano | 2017-03-27 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | tests: lint for run-away here-docjc/lint-runaway-here-doc | Junio C Hamano | 2017-03-23 | 1 | -3/+3 |
* | | | | | | Merge branch 'st/verify-tag' | Junio C Hamano | 2017-03-27 | 2 | -14/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7004, t7030: fix here-doc syntax errorsst/verify-tag | Santiago Torres | 2017-03-24 | 2 | -14/+10 |
* | | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script' | Junio C Hamano | 2017-03-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7406: correct test case for submodule-update initial populationsb/submodule-update-initial-runs-custom-script | Junio C Hamano | 2017-03-22 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'jk/quote-env-path-list-component' | Junio C Hamano | 2017-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5615: fix a here-doc syntax errorjk/quote-env-path-list-component | Junio C Hamano | 2017-03-22 | 1 | -0/+1 |
* | | | | | | | | | Sync with 2.12.2 | Junio C Hamano | 2017-03-24 | 3 | -2/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Git 2.12.2v2.12.2 | Junio C Hamano | 2017-03-24 | 3 | -2/+25 |
| * | | | | | | | | | Merge branch 'ab/doc-no-option-notation-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ab/push-default-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/commit-hook-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/config-case-cmdline-take-2' into maint | Junio C Hamano | 2017-03-24 | 2 | -97/+163 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-no-index-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -27/+121 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/remote-helpers-with-git-dir' into maint | Junio C Hamano | 2017-03-24 | 4 | -3/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-config-parse-ignore-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-deadlock-regression-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -11/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | mailmap: use Michael J Gruber's new addressmg/mailmap | Michael J Gruber | 2017-03-24 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | Seventh batch for 2.13 | Junio C Hamano | 2017-03-24 | 1 | -9/+29 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/sha1dc' | Junio C Hamano | 2017-03-24 | 9 | -2/+2405 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Makefile: make DC_SHA1 the default | Junio C Hamano | 2017-03-17 | 1 | -6/+10 |
| * | | | | | | | | | | | | | | | | | | t0013: add a basic sha1 collision detection test | Jeff King | 2017-03-17 | 3 | -0/+20 |
| * | | | | | | | | | | | | | | | | | | Makefile: add DC_SHA1 knob | Jeff King | 2017-03-17 | 4 | -0/+47 |
| * | | | | | | | | | | | | | | | | | | sha1dc: disable safe_hash feature | Jeff King | 2017-03-16 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | sha1dc: adjust header includes for git | Jeff King | 2017-03-16 | 4 | -13/+9 |