Skip to content

Commit 11133e1

Browse files
committed
remove confusing outdated note on interactive rebasing
1 parent 42c80d1 commit 11133e1

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

contributing/code/patches.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ patch. Before re-submitting the patch, rebase with ``upstream/master`` or
373373
374374
.. note::
375375

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

@@ -385,8 +385,7 @@ convert many commits to one commit. To do this, use the rebase command:
385385
$ git rebase -i upstream/master
386386
$ git push -f origin BRANCH_NAME
387387
388-
The number 3 here must equal the amount of commits in your branch. After you
389-
type this command, an editor will popup showing a list of commits:
388+
After you type this command, an editor will popup showing a list of commits:
390389

391390
.. code-block:: text
392391

0 commit comments

Comments
 (0)