saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clarify git rebase instructions

Browse source
This commit is contained in:
Justin Findlay 2015-05-25 23:05:23 -06:00
parent 3517e0095f
commit a0b76b57b3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/topics/development/contributing.rst
View file

@ -99,14 +99,16 @@ Fork a Repo Guide_>`_ and is well worth reading.
.. code-block:: bash
git rebase upstream/2014.7
git fetch upstream
git rebase upstream/2014.7 fix-broken-thing
git push --set-upstream origin fix-broken-thing
or,
.. code-block:: bash
git rebase upstream/develop
git fetch upstream
git rebase upstream/develop add-cool-feature
git push --set-upstream origin add-cool-feature
#. Find the branch on your GitHub salt fork.