... above branch is called a "topic branch" in Git parlance. You are free to rewrite the history of this branch, by using git rebase for example. Other people shouldn't base their work on such a branch, because their clone would become corrupt when you ed ... , save, and close to update the commit. To change the message of an earlier commit, use the "reword" option in interactive rebase. For example, to reword one of the last three commits: git rebase -i HEAD~3 This opens an editor listing the three commits ... it containing all your work. To rework the history of your branch you can squash the commits into one by using interactive rebase: git rebase -i HEAD~2 The HEAD~2 above is shorthand for two latest commits. The above command will open an editor showing ... ... above branch is called a "topic branch" in Git parlance. You are free to rewrite the history of this branch, by using git rebase for example. Other people shouldn't base their work on such a branch, because their clone would become corrupt when you ed ... , save, and close to update the commit. To change the message of an earlier commit, use the "reword" option in interactive rebase. For example, to reword one of the last three commits: git rebase -i HEAD~3 This opens an editor listing the three commits ... it containing all your work. To rework the history of your branch you can squash the commits into one by using interactive rebase: git rebase -i HEAD~2 The HEAD~2 above is shorthand for two latest commits. The above command will open an editor showing ... ... pr #### を実行すると、対応するプルリクエストをチェックアウトできます。 この時点で、コードに手を加えることができます。 git rebase -i と git commit --amend を使って、コミットの品質が期待通りのものであることを確認しましょう。準備ができたら次のようにします ... : / $ # Pull in the latest changes from main. $ git checkout main $ git pull upstream main $ # Rebase the pull request on main. $ git checkout pr/#### $ git rebase main $ git checkout main $ # Merge the work as "fast-forward ... " to main to avoid a merge commit. $ # (in practice, you can omit "--ff-only" since you just rebased) $ git merge --ff-only pr/XXXX $ # If you're not sure if you did things correctly, check that only the $ # changes you ex ... ... pr #### を実行すると、対応するプルリクエストをチェックアウトできます。 この時点で、コードに手を加えることができます。 git rebase -i と git commit --amend を使って、コミットの品質が期待通りのものであることを確認しましょう。準備ができたら次のようにします ... : / $ # Pull in the latest changes from main. $ git checkout main $ git pull upstream main $ # Rebase the pull request on main. $ git checkout pr/#### $ git rebase main $ git checkout main $ # Merge the work as "fast-forward ... " to main to avoid a merge commit. $ # (in practice, you can omit "--ff-only" since you just rebased) $ git merge --ff-only pr/XXXX $ # If you're not sure if you did things correctly, check that only the $ # changes you ex ... ... $ git checkout stable/4.1.x $ git pull If this is a security release, merge the appropriate patches from django-security . Rebase these patches as necessary to make each one a plain commit on the release branch rather than a merge commit. To ensure thi ... for the next release in the 4.1 series.) If git refuses to merge with --ff-only , switch to the security-patch branch and rebase it on the branch you are about to merge it into ( git checkout security/4.1.x; git rebase stable/4.1.x ) and then switch b ... ... $ git checkout stable/4.1.x $ git pull If this is a security release, merge the appropriate patches from django-security . Rebase these patches as necessary to make each one a plain commit on the release branch rather than a merge commit. To ensure thi ... for the next release in the 4.1 series.) If git refuses to merge with --ff-only , switch to the security-patch branch and rebase it on the branch you are about to merge it into ( git checkout security/4.1.x; git rebase stable/4.1.x ) and then switch b ... 2026年10月08日