Skip to content
代码片段 群组 项目
未验证 提交 9c8a3f08 编辑于 作者: Russell Dickenson's avatar Russell Dickenson 提交者: GitLab
浏览文件

Merge branch '493994-aqualls-last-illustration' into 'master'

Replace old diagram with editable illustration

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183610



Merged-by: default avatarRussell Dickenson <rdickenson@gitlab.com>
Approved-by: default avatarRussell Dickenson <rdickenson@gitlab.com>
Co-authored-by: default avatarAmy Qualls <aqualls@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
...@@ -19,9 +19,11 @@ When you rebase: ...@@ -19,9 +19,11 @@ When you rebase:
1. Git imports all the commits submitted to your target branch after you initially created 1. Git imports all the commits submitted to your target branch after you initially created
your branch from it. your branch from it.
1. Git applies the commits from your branch on top of the imported commits: 1. Git applies the commits from your branch on top of the imported commits. In this example, after
a branch named `feature` is created (in orange), four commits from `main` (in purple) are
imported into the `feature` branch:
![Git rebase illustration](img/git_rebase_illustration.png) ![Git rebase illustration](img/rebase_v17_10.drawio.svg)
While most rebases are performed against `main`, you can rebase against any other While most rebases are performed against `main`, you can rebase against any other
branch. You can also specify a different remote repository. branch. You can also specify a different remote repository.
......
doc/topics/git/img/git_rebase_illustration.png

31.6 KB

此差异已折叠。
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册