Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
software-for-seismometry
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Seitosh
software-for-seismometry
Commits
2fb72b2a
Commit
2fb72b2a
authored
Sep 29, 2016
by
thomas.forbriger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
master [TASK]: introduce new branch master-with-examples
parent
789f4119
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
README.md
README.md
+4
-1
No files found.
README.md
View file @
2fb72b2a
...
...
@@ -61,7 +61,10 @@ Source code is provided on branch `vendor`.
just before next vendor snapshot
`vendor`
: vendor import branch (just code, no example data)
`vendor-with-examples`
: vendor import with data file examples
`master`
: will point to
`vendor`
`master`
: is a child of
`vendor`
(additionally contains local
modifications and additions)
`master-with-examples`
: is a child of
`vendor-with-examples`
(additionally
contains local modifications and additions)
`workbench`
: separate branch providing tools for vendor imports
### merge hierarchy
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment