A negative list of non-feature-branches names
is already supported - this patch adds a list of
branches names which *will* be considered as
feature branches.
Allows changing the currently hardcoded set of
expected feature branch names, from:
* master|trunk|default|develop
To any set of names or patterns that you desire.
* 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.
Following the discussion in #5823 it has become clear that this feature is supplied at-your-own-risk, this should be more explicitly reflected in its documentation.
Using JSON object should be discouraged as there is no explicit order
of keys in JSON object. Even though it's deterministic in current PHP
version, it may change any time. As stated on http://json.org/:
"An object is an unordered set of name/value pairs. An object begins
with { (left brace) and ends with } (right brace). Each name is
followed by : (colon) and the name/value pairs are separated
by , (comma)."
Fixes#2802.
@Seldaek: As discussed yesterday here addition to the docs re PHP extensions. I have put it as a note as it appears emphasized for users to notice easily.
# By Jordi Boggiano (30) and others
# Via Jordi Boggiano (37) and Morgan Campbell (1)
* 'master' of https://github.com/composer/composer: (83 commits)
Update 01-basic-usage.md
Revert 331425bcb3 as well, fixes#3612
Revert "Disable overwrites when no-ansi is present, fixes #3612"
Update deps
Use justinrainbow/json-schema 1.4
Improved wording
Fix docs basic-auth => http-basic
Add test for Generics class
Single variable for traits and enums
Use HHVM_VERSION instead of HPHP_VERSION
Add support for using classmap to autoload Hack enums
Re-use existing autoloader suffix if available, fixes#3701
Report Travis CI build success early
Test on HHVM nightly releases. Allow to fail.
Make parseJson safer
Use get home from Config instead of factory
Fix env override regression, fixes#3820
[create-project] Used no progress value for dependencies
Add docBlock and fix CS
Fix output of first line of progress when output is not decorated, refs #3818
...
Gabriel Caruso
Martin Hujer
Jordi Boggiano
Alex Mersdorf
Claus Due
Jonas Thelemann
Javier Eguiluz
Nils Adermann
Kael Shipman
Mark Watney
Niels Keurentjes
Rob
Tomáš Fejfar
vbashkirtsev
bohwaz
Tomáš Markacz
marsuboss
Anthony Kuske
Oliver THEBAULT
=
Thibault Jamet
coderstephen
Possum
Geo
msiebeneicher
rkerner