diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-10 18:09:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-10 18:09:07 +0000 |
| commit | 206b03aeae3a368983ac3d6ad5e5828030bbaacd (patch) | |
| tree | d36ce0745729f64bb54c468422f896c53748672c /doc/topics | |
| parent | ff06f859cdabec3c874c004f93fe5082aeacf917 (diff) | |
| download | gitlab-ce-206b03aeae3a368983ac3d6ad5e5828030bbaacd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/autodevops/img/autodevops_multiple_clusters.png | bin | 12619 -> 0 bytes | |||
| -rw-r--r-- | doc/topics/git/git_rebase.md | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/topics/autodevops/img/autodevops_multiple_clusters.png b/doc/topics/autodevops/img/autodevops_multiple_clusters.png Binary files differdeleted file mode 100644 index f4d101ca921..00000000000 --- a/doc/topics/autodevops/img/autodevops_multiple_clusters.png +++ /dev/null diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md index 6f50dea26dd..c01080400ac 100644 --- a/doc/topics/git/git_rebase.md +++ b/doc/topics/git/git_rebase.md @@ -119,7 +119,7 @@ repository, you can run `git remote -v`. If there are [merge conflicts](#merge-conflicts), Git will prompt you to fix them before continuing the rebase. -To learn more, check Git's documentation on [rebasing](ttps://git-scm.com/book/en/v2/Git-Branching-Rebasing) +To learn more, check Git's documentation on [rebasing](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) and [rebasing strategies](https://git-scm.com/book/en/v2/Git-Branching-Rebasing). ### Interactive rebase |
