diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-03-04 10:33:43 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-03-04 18:35:06 +0000 |
| commit | 9887fe3d15210b67c0d73df77923744dfb8bb267 (patch) | |
| tree | 75eb9f1f72d2261867de85c7315299527e9d72e2 /docbook | |
| parent | 00318b3267c22528134ffefa026f9a46abc3f5f9 (diff) | |
WSDG: Describe our tag naming conventions.
Change-Id: Icb8ba1be843b8a109713df9260330df5b215bf0b
Reviewed-on: https://code.wireshark.org/review/32318
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.adoc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.adoc b/docbook/wsdg_src/WSDG_chapter_sources.adoc index a89d7119bd..d75ec89589 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.adoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.adoc @@ -77,14 +77,21 @@ You can also view commit logs, branches, tags, and past revisions: https://code.wireshark.org/review/gitweb?p=wireshark.git +==== Git Naming Conventions + Like most revision control systems, Git uses http://en.wikipedia.org/wiki/Branching_%28revision_control%29[branching] to manage different copies of the source code and allow parallel development. -Wireshark uses the following branches for official releases: +Wireshark uses the following branch naming conventions: + +* _master_: Main feature development and odd-numbered “development” releases. +* _master-x.y_: Stable release maintenance. For example, master-3.0 is used + to manage the 3.0.x official releases. -* _master_: Main feature development and odd-numbered "feature" releases. -* _master-x.y_: Stable release maintenance. For example, master-1.10 is used - to manage the 1.10.x official releases. +Tags for major releases and release candidates consist of a “v” followed +by a version number such as “v3.0.1” or “v3.0.3rc0”. Major releases +additionally have a tag prefixed with “wireshark-” followed by a version +number, such as “wireshark-3.0.0”. [[ChSrcObtain]] |