Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Benjamin Jakimow
EO Time Series Viewer
Commits
20054c18
Commit
20054c18
authored
Mar 29, 2014
by
Luke Campagnola
Browse files
Corrected how-to-use documentation on using git subtrees
parent
77e02ede
Changes
1
Hide whitespace changes
Inline
Side-by-side
doc/source/how_to_use.rst
View file @
20054c18
...
...
@@ -115,9 +115,9 @@ For projects that already use git for code control, it is also possible to inclu
my_project$ git remote add pyqtgraph-core https://github.com/pyqtgraph/pyqtgraph-core.git
my_project$ git fetch pyqtgraph-core
my_project$ git merge -s ours --no-commit pyqtgraph-core/
develop
my_project$ git merge -s ours --no-commit pyqtgraph-core/
core
my_project$ mkdir pyqtgraph
my_project$ git read-tree -u --prefix=pyqtgraph/ pyqtgraph-core/
develop
my_project$ git read-tree -u --prefix=pyqtgraph/ pyqtgraph-core/
core
my_project$ git commit -m "Added pyqtgraph to project repository"
See the ``git subtree`` documentation for more information.
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