Skip to content

Commit

Permalink
bug #3460 remove confusing outdated note on interactive rebasing (xab…
Browse files Browse the repository at this point in the history
…buh)

This PR was merged into the 2.3 branch.

Discussion
----------

remove confusing outdated note on interactive rebasing

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | #3458

Commits
-------

eec82ed remove confusing outdated note on interactive rebasing
  • Loading branch information
weaverryan committed Jan 21, 2014
2 parents 6831b13 + eec82ed commit e0a52ec
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions contributing/code/patches.rst
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Check that all tests still pass and push your branch remotely:

.. code-block:: bash
$ git push -f origin BRANCH_NAME
$ git push --force origin BRANCH_NAME
Make a Pull Request
~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -369,11 +369,11 @@ patch. Before re-submitting the patch, rebase with ``upstream/master`` or
.. code-block:: bash
$ git rebase -f upstream/master
$ git push -f origin BRANCH_NAME
$ git push --force origin BRANCH_NAME
.. note::

when doing a ``push --force``, always specify the branch name explicitly
When doing a ``push --force``, always specify the branch name explicitly
to avoid messing other branches in the repo (``--force`` tells Git that
you really want to mess with things so do it carefully).

Expand All @@ -383,10 +383,9 @@ convert many commits to one commit. To do this, use the rebase command:
.. code-block:: bash
$ git rebase -i upstream/master
$ git push -f origin BRANCH_NAME
$ git push --force origin BRANCH_NAME
The number 3 here must equal the amount of commits in your branch. After you
type this command, an editor will popup showing a list of commits:
After you type this command, an editor will popup showing a list of commits:

.. code-block:: text
Expand Down

0 comments on commit e0a52ec

Please sign in to comment.