diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
| commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
| tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /doc/gitlab-basics | |
| parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'doc/gitlab-basics')
| -rw-r--r-- | doc/gitlab-basics/command-line-commands.md | 6 | ||||
| -rw-r--r-- | doc/gitlab-basics/start-using-git.md | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/gitlab-basics/command-line-commands.md b/doc/gitlab-basics/command-line-commands.md index 52facc7bd1a..fe69346c316 100644 --- a/doc/gitlab-basics/command-line-commands.md +++ b/doc/gitlab-basics/command-line-commands.md @@ -33,9 +33,9 @@ The list below is not exhaustive, but contains many of the most commonly used co |--------------------------------|---------------------------------------------| | `cd NAME-OF-DIRECTORY` | Go into a directory to work in it | | `cd ..` | Go back one directory | -| `ls` | List what’s in the current directory | -| `ls a*` | List what’s in the current directory that starts with `a` | -| `ls *.md` | List what’s in the current directory that ends with `.md` | +| `ls` | List what's in the current directory | +| `ls a*` | List what's in the current directory that starts with `a` | +| `ls *.md` | List what's in the current directory that ends with `.md` | | `mkdir NAME-OF-YOUR-DIRECTORY` | Create a new directory | | `cat README.md` | Display the contents of a [text file you created previously](#create-a-text-file-in-the-current-directory) | | `pwd` | Show the current directory | diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md index 3c824cb5286..a3c8946700a 100644 --- a/doc/gitlab-basics/start-using-git.md +++ b/doc/gitlab-basics/start-using-git.md @@ -13,11 +13,11 @@ handle everything from small to very large projects with speed and efficiency. G on top of Git. While GitLab has a powerful user interface from which you can do a great amount of Git operations -directly in the browser, you’ll eventually need to use Git through the command line for advanced +directly in the browser, you'll eventually need to use Git through the command line for advanced tasks. For example, if you need to fix complex merge conflicts, rebase branches, -merge manually, or undo and roll back commits, you musto use Git from +merge manually, or undo and roll back commits, you must use Git from the command line and then push your changes to the remote server. This guide helps you get started with Git through the command line and can be your reference @@ -27,7 +27,7 @@ can download the GitLab [Git Cheat Sheet](https://about.gitlab.com/images/press/ > For more information about the advantages of working with Git and GitLab: > > - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> Watch the [GitLab Source Code Management Walkthrough](https://www.youtube.com/watch?v=wTQ3aXJswtM) video. -> - Learn how GitLab became the backbone of [Worldline](https://about.gitlab.com/customers/worldline/)’s development environment. +> - Learn how GitLab became the backbone of [Worldline](https://about.gitlab.com/customers/worldline/)'s development environment. NOTE: To help you visualize what you're doing locally, there are |