Skip to content

remove confusing outdated note on interactive rebasing #3460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2014
Merged

remove confusing outdated note on interactive rebasing #3460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions contributing/code/patches.rst
View file
Open in desktop
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