Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commiteec82ed

Browse files
committed
remove confusing outdated note on interactive rebasing
1 parent42c80d1 commiteec82ed

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

‎contributing/code/patches.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ Check that all tests still pass and push your branch remotely:
244244

245245
..code-block::bash
246246
247-
$ git push -f origin BRANCH_NAME
247+
$ git push --force origin BRANCH_NAME
248248
249249
Make a Pull Request
250250
~~~~~~~~~~~~~~~~~~~
@@ -369,11 +369,11 @@ patch. Before re-submitting the patch, rebase with ``upstream/master`` or
369369
..code-block::bash
370370
371371
$ git rebase -f upstream/master
372-
$ git push -f origin BRANCH_NAME
372+
$ git push --force origin BRANCH_NAME
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

@@ -383,10 +383,9 @@ convert many commits to one commit. To do this, use the rebase command:
383383
..code-block::bash
384384
385385
$ git rebase -i upstream/master
386-
$ git push -f origin BRANCH_NAME
386+
$ git push --force 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)

[8]ページ先頭

©2009-2025 Movatter.jp