The wikipedia section `Version_control#Common_vocabulary` has moved to `Version_control#Common_terminology`.
You know, scrolling along is harassing :-)
* master: (48 commits)
SVN: hide passwords for debug output
Free $solver asap
fixes#8179
[minor] Fixed a typo in the CHANGELOG.md.
Update deps
Update changelog
Revert "Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET" Revert "Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151"
Add docs for COMPOSER_SELF_UPDATE_TARGET, refs #8151
Fix display of HHVM warning appearing when HHVM is not in use, fixes#8138
Read classmap-authoritative and apcu-autoloader from project config when installing via create-project, fixes#8155
Use possessive quantifiers
Update xdebug-handler to 1.3.3
fixes#8159
Allow overriding self-update target file with envvar COMPOSER_SELF_UPDATE_TARGET
flag should come before script name
use full command name, not abbreviated/alias
modify text
Document the alternatives to disable the default script timeout
Anchor pattern
Fix URL resolution for Composer repositories
...
Mentioning and giving an example of the usage of the 4 options to disable the default script timeout of 300 seconds:
1. Static helper (already exists and kept).
2. Config key "process-timeout".
3. Environment variable "COMPOSER_PROCESS_TIMEOUT".
4. The "--timeout" parameter.
* master:
Follow up to #7946 test: add solver flag to assert path execution
Fix tests
Make sure config command output is also output on --quiet so that warnings can be hidden, fixes#7963
Recognize composer-plugin-api as a platform package, fixes#7951
Quote wildcards to avoid issues in some shells, fixes#7960
Avoid dumping null values for dist reference/shasum and source reference, fixes#7955
Soften hard exit after revert of composer file
Make unixy proxy code POSIX compatible
Update aliases.md
Same but for Problem.php
Better error message for present but incompatible versions
Fix inconsistent casing
Don't do (new Foo())->bar() - not 5.3-compatible
Support identifying the HHVM version when not running with HHVM
* docs-improve:
Docs: cleanup version branches section
Docs: those/these composer/Composer
Docs: notice => note
Docs: Fix shell sample output
Docs: Add back a second clear note about hardcoded versions in VCS
Docs: HHVM is not called HipHop
Docs: versions plural, and update == rm lock&install
Docs: don't use short forms, it => composer
Docs: composer.lock lists versions, not constraints
Docs: superfluous comma & it => Composer
The confusing part is probably rather constraints and how versions work, not what they are
Docs: Clarify what "It" stands for
Finished reworking docs to clarify points about versioning (fixes#6088)
Updated basic usage and versions pages to clarify how versioning and package resolution works (refs #6088)
Added some useful overview information about repositories in the Basic Usage documentation.
- remove the xdebug section, since it will be irrelevant from v1.3
- add cPanel shell fork bomb protection as an other possible root cause of memory errors
Frank Prins
Ayesh Karunaratne
Jordi Boggiano
Grummfy
Elan Ruusamäe
Fabien Villepinte
Christophe Coevoet
Romain
Markus Staab
Andreas Möller
John Stevenson
kpitn
Nils Adermann
Rob Bast
Guilherme Rossato
Kevin Boyd
Gregor Hyneck
Jim Birch
Marc Wilhelm
Jérôme Deuchnord
Sven Luijten
Christian Flothmann
Kat
Gabriel Caruso
Martin Hujer
Mathias Brodala
Sonja Leaf
Petr Heinz
Bartek Zdanowski
Thom Toogood
Victor Isadov
frezno
Thorsten Frommen
Aleksei Khudiakov
Kael Shipman
Tilo Baller
Filippo Tessarotto
Michael Cullum
Alessandro Lai
Baptiste Donaux