Skip to content

G
gitlab-ce
Commit a2419c26 authored by Suzanne Selhorn's avatar Suzanne Selhorn
Browse files
Options

Merge branch 'docs-331024' into 'master' 

Full review of Start using Git on the command line

See merge request gitlab-org/gitlab!62779
parents b9b17b38 df49c251
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 114 deletions
doc/gitlab-basics/add-file.md
View file @ a2419c26
...@@ -33,7 +33,7 @@ cd <destination folder> ...@@ -33,7 +33,7 @@ cd <destination folder>
to the default branch should be avoided unless your project is very small and you're the to the default branch should be avoided unless your project is very small and you're the
only person working on it. only person working on it.
You can also [switch to an existing branch](start-using-git.md#work-on-an-existing-branch) You can also [switch to an existing branch](start-using-git.md#switch-to-a-branch)
if you have one already. if you have one already.
Using your standard tool for copying files (for example, Finder in macOS, or File Explorer Using your standard tool for copying files (for example, Finder in macOS, or File Explorer
......
doc/gitlab-basics/create-branch.md
View file @ a2419c26
...@@ -9,7 +9,7 @@ type: howto ...@@ -9,7 +9,7 @@ type: howto
A branch is an independent line of development in a [project](../user/project/index.md). A branch is an independent line of development in a [project](../user/project/index.md).
When you create a new branch (in your [terminal](start-using-git.md#create-a-branch) or with When you create a new branch (in your [terminal](start-using-git.md#create-and-work-in-a-branch) or with
[the web interface](../user/project/repository/web_editor.md#create-a-new-branch)), [the web interface](../user/project/repository/web_editor.md#create-a-new-branch)),
you are creating a snapshot of a certain branch, usually the main branch, you are creating a snapshot of a certain branch, usually the main branch,
at its current state. From there, you can start to make your own changes without at its current state. From there, you can start to make your own changes without
......
doc/gitlab-basics/start-using-git.md
View file @ a2419c26
...@@ -13,39 +13,38 @@ handle everything from small to very large projects with speed and efficiency. G ...@@ -13,39 +13,38 @@ handle everything from small to very large projects with speed and efficiency. G
on top of Git. on top of Git.
While GitLab has a powerful user interface from which you can do a great amount of Git operations 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, the command line is required for advanced tasks.
tasks.
For example, if you need to fix complex merge conflicts, rebase branches, For example, if you need to fix complex merge conflicts, rebase branches,
merge manually, or undo and roll back commits, you must use Git from or undo and roll back commits, you must use Git from
the command line and then push your changes to the remote server. 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 This guide helps you get started with Git through the command line and can be a reference
for Git commands in the future. If you're only looking for a quick reference of Git commands, you for Git commands in the future. If you're only looking for a quick reference of Git commands, you
can download the GitLab [Git Cheat Sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf). can download the GitLab [Git Cheat Sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf).
> For more information about the advantages of working with Git and GitLab: For more information about the advantages of working with Git and GitLab:
>
> - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Watch the [GitLab Source Code Management Walkthrough](https://www.youtube.com/watch?v=wTQ3aXJswtM) video. - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;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: NOTE:
To help you visualize what you're doing locally, there are To help you visualize what you're doing locally, there are
[Git GUI apps](https://git-scm.com/download/gui/) you can install. [Git GUI apps](https://git-scm.com/download/gui/) you can install.
## Requirements ## Prerequisites
You don't need a GitLab account to use Git locally, but for the purpose of this guide we You don't need a GitLab account to use Git locally, but for the purpose of this guide we
recommend registering and signing into your account before starting. Some commands need a recommend registering and signing into your account before starting. Some commands need a
connection between the files in your computer and their version on a remote server. connection between the files on your computer and their version on a remote server.
You must also open a [command shell](#command-shell) and have You must also open a [terminal](#open-a-terminal) and have
[Git installed](#install-git) in your computer. [Git installed](#install-git) on your computer.
### Command shell ### Open a terminal
To execute Git commands in your computer, you must open a command shell (also known as command To execute Git commands on your computer, you must open a terminal (also known as command
prompt, terminal, and command line) of your preference. Here are some suggestions: prompt, command shell, and command line) of your preference. Here are some suggestions:
- For macOS users: - For macOS users:
- Built-in: [Terminal](https://blog.teamtreehouse.com/introduction-to-the-mac-os-x-command-line). Press <kbd>⌘ command</kbd> + <kbd>space</kbd> and type "terminal" to find it. - Built-in: [Terminal](https://blog.teamtreehouse.com/introduction-to-the-mac-os-x-command-line). Press <kbd>⌘ command</kbd> + <kbd>space</kbd> and type "terminal" to find it.
...@@ -59,7 +58,7 @@ prompt, terminal, and command line) of your preference. Here are some suggestion ...@@ -59,7 +58,7 @@ prompt, terminal, and command line) of your preference. Here are some suggestion
### Install Git ### Install Git
Open a command shell and run the following command to check if Git is already installed in your Open a terminal and run the following command to check if Git is already installed in your
computer: computer:
```shell ```shell
...@@ -113,45 +112,35 @@ You have two options: ...@@ -113,45 +112,35 @@ You have two options:
- Authenticate on a project-by-project basis through HTTPS, and enter your credentials every time - Authenticate on a project-by-project basis through HTTPS, and enter your credentials every time
you perform an operation between your computer and GitLab. you perform an operation between your computer and GitLab.
- Authenticate through SSH once and GitLab no longer requests your credentials every time you pull, push, - Authenticate through SSH once and GitLab no longer requests your credentials every time you
and clone. perform an operation between your computer and GitLab.
To start the authentication process, we'll [clone](#clone-a-repository) an existing repository To start the authentication process, we'll [clone](#clone-a-repository) an existing repository
to our computer: to our computer:
- If you want to use **SSH** to authenticate, follow the instructions on the [SSH documentation](../ssh/README.md) - If you want to use **SSH** to authenticate, follow the instructions on the [SSH documentation](../ssh/README.md)
to set it up before cloning. to set it up before cloning.
- If you want to use **HTTPS**, GitLab requests your user name and password: - If you want to use **HTTPS**, GitLab requests your username and password:
- If you have 2FA enabled for your account, you must use a [Personal Access Token](../user/profile/personal_access_tokens.md) - If you have 2FA enabled for your account, you must use a [Personal Access Token](../user/profile/personal_access_tokens.md)
with **read_repository** or **write_repository** permissions instead of your account's password. with **read_repository** or **write_repository** permissions instead of your account's password.
Create one before cloning.
- If you don't have 2FA enabled, use your account's password. - If you don't have 2FA enabled, use your account's password.
NOTE: NOTE:
Authenticating via SSH is the GitLab recommended method. You can read more about credential storage Authenticating through SSH is the GitLab recommended method. You can read more about credential storage
in the [Git Credentials documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage). in the [Git Credentials documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage).
## Git terminology ## Git terminology
If you're familiar with the Git terminology, you may want to jump directly If you're familiar with Git terminology, you may want to jump directly
into the [basic commands](#basic-git-commands). into [setting up a repository](#set-up-a-repository).
### Namespace
A **namespace** is either a **user name** or a **group name**.
For example, suppose Jo is a GitLab.com user and they chose their user name as
`jo`. You can see Jo's profile at `https://gitlab.com/jo`. `jo` is a namespace.
Jo also created a group in GitLab, and chose the path `test-group` for their
group. The group can be accessed under `https://gitlab.com/test-group`. `test-group` is a namespace.
### Repository ### Repository
Your files in GitLab live in a **repository**, similar to how you have them in a folder or Your files in GitLab live in a **repository**, similar to how you have them in a folder or
directory in your computer. **Remote** repository refers to the files in directory on your computer.
GitLab and the copy in your computer is called **local** copy.
A **project** in GitLab is what holds a repository, which holds your files. - **Remote** repository refers to the files in GitLab.
- A **local** copy refers to the files on your computer.
<!-- vale gitlab.Spelling = NO --> <!-- vale gitlab.Spelling = NO -->
<!-- vale gitlab.SubstitutionWarning = NO --> <!-- vale gitlab.SubstitutionWarning = NO -->
...@@ -159,22 +148,25 @@ Often, the word "repository" is shortened to "repo". ...@@ -159,22 +148,25 @@ Often, the word "repository" is shortened to "repo".
<!-- vale gitlab.Spelling = YES --> <!-- vale gitlab.Spelling = YES -->
<!-- vale gitlab.SubstitutionWarning = YES --> <!-- vale gitlab.SubstitutionWarning = YES -->
A **project** in GitLab is what holds a repository.
### Fork ### Fork
When you want to copy someone else's repository, you [**fork**](../user/project/repository/forking_workflow.md#creating-a-fork) When you want to copy someone else's repository, you [**fork**](../user/project/repository/forking_workflow.md#creating-a-fork)
the project. By forking it, you create a copy of the project into your own the project. By forking it, you create a copy of the project into your own
namespace to have read and write permissions to modify the project files [namespace](../user/group/#namespaces) to have read and write permissions to modify the project files
and settings. and settings.
For example, if you fork this project, <https://gitlab.com/gitlab-tests/sample-project/> into your namespace, you create your own copy of the repository in your namespace (`https://gitlab.com/your-namespace/sample-project/`). From there, you can clone it into your computer, For example, if you fork this project, <https://gitlab.com/gitlab-tests/sample-project/> into your namespace,
work on its files, and (optionally) submit proposed changes back to the you create your own copy of the repository in your namespace (`https://gitlab.com/your-namespace/sample-project/`).
original repository if you'd like. From there, you can clone the repository, work on the files, and (optionally) submit proposed changes back to the
original repository.
### Download vs clone ### Difference between download and clone
To create a copy of a remote repository's files on your computer, you can either To create a copy of a remote repository's files on your computer, you can either
**download** or **clone**. If you download, you cannot sync it with the **download** or **clone** the repository. If you download it, you cannot sync the repository with the
remote repository on GitLab. remote version on GitLab.
[Cloning](#clone-a-repository) a repository is the same as downloading, except it preserves the Git connection [Cloning](#clone-a-repository) a repository is the same as downloading, except it preserves the Git connection
with the remote repository. This allows you to modify the files locally and with the remote repository. This allows you to modify the files locally and
...@@ -182,44 +174,42 @@ upload the changes to the remote repository on GitLab. ...@@ -182,44 +174,42 @@ upload the changes to the remote repository on GitLab.
### Pull and push ### Pull and push
After you saved a local copy of a repository and modified its files on your computer, you can upload the After you save a local copy of a repository and modify the files on your computer, you can upload the
changes to GitLab. This is referred to as **pushing** to GitLab, as this is achieved by the command changes to GitLab. This is referred to as **pushing** to the remote, as this is achieved by the command
[`git push`](#send-changes-to-gitlabcom). [`git push`](#send-changes-to-gitlabcom).
When the remote repository changes, your local copy is behind it. You can update it with the new When the remote repository changes, your local copy is behind. You can update your local copy with the new
changes in the remote repository. changes in the remote repository.
This is referred to as **pulling** from GitLab, as this is achieved by the command This is referred to as **pulling** from the remote, as this is achieved by the command
[`git pull`](#download-the-latest-changes-in-the-project). [`git pull`](#download-the-latest-changes-in-the-project).
## Basic Git commands ## Set up a repository
For the purposes of this guide, we use this example project on GitLab.com: Git commands will work with any Git repository.
[https://gitlab.com/gitlab-tests/sample-project/](https://gitlab.com/gitlab-tests/sample-project/).
To use it, log into GitLab.com and fork the example project into your For the purposes of this guide, we refer to this example project on GitLab.com:
namespace to have your own copy to playing with. Your sample [https://gitlab.com/gitlab-tests/sample-project/](https://gitlab.com/gitlab-tests/sample-project/).
project is available under `https://gitlab.com/<your-namespace>/sample-project/`. Remember to replace the example URLs with the relevant path of your project.
You can also choose any other project to follow this guide. Then, replace the To get started, choose one of the following:
example URLs with your own project's.
If you want to start by copying an existing GitLab repository onto your - Use the example project by signing into GitLab.com and [forking](../user/project/repository/forking_workflow.md#creating-a-fork)
computer, see how to [clone a repository](#clone-a-repository). On the other it into your namespace to make it available under `https://gitlab.com/<your-namespace>/sample-project/`.
hand, if you want to start by uploading an existing folder from your computer - Copy an existing GitLab repository onto your computer by [cloning a repository](#clone-a-repository).
to GitLab, see how to [convert a local folder into a Git repository](#convert-a-local-directory-into-a-repository). - Upload an existing folder from your computer to GitLab by [converting a local folder into a Git repository](#convert-a-local-directory-into-a-repository).
### Clone a repository ### Clone a repository
To start working locally on an existing remote repository, clone it with the To start working locally on an existing remote repository, clone it with the
command `git clone <repository path>`. You can either clone it via [HTTPS](#clone-via-https) command `git clone <repository path>`. You can either clone it using [HTTPS](#clone-using-https)
or [SSH](#clone-via-ssh), according to your preferred [authentication method](#git-authentication-methods). or [SSH](#clone-using-ssh), according to your preferred [authentication method](#git-authentication-methods).
You can find both paths (HTTPS and SSH) by navigating to your project's landing page You can find both paths (HTTPS and SSH) by navigating to your project's landing page
and clicking **Clone**. GitLab prompts you with both paths, from which you can copy and clicking **Clone**. GitLab prompts you with both paths, from which you can copy
and paste in your command line. You can also and paste in your command line. You can also
[clone and open directly in Visual Studio Code](../user/project/repository/index.md#clone-and-open-in-apple-xcode). [clone and open directly in Visual Studio Code](../user/project/repository/index.md#clone-and-open-in-apple-xcode).
For example, considering our [sample project](https://gitlab.com/gitlab-tests/sample-project/): For example, with our [sample project](https://gitlab.com/gitlab-tests/sample-project/):
- To clone through HTTPS, use `https://gitlab.com/gitlab-tests/sample-project.git`. - To clone through HTTPS, use `https://gitlab.com/gitlab-tests/sample-project.git`.
- To clone through SSH, use `git@gitlab.com:gitlab-tests/sample-project.git`. - To clone through SSH, use `git@gitlab.com:gitlab-tests/sample-project.git`.
...@@ -232,22 +222,22 @@ name and preserve the connection with the remote repository. ...@@ -232,22 +222,22 @@ name and preserve the connection with the remote repository.
You can then navigate to the new directory with `cd sample-project` and start working on it You can then navigate to the new directory with `cd sample-project` and start working on it
locally. locally.
#### Clone via HTTPS #### Clone using HTTPS
To clone `https://gitlab.com/gitlab-tests/sample-project/` via HTTPS: To clone `https://gitlab.com/gitlab-tests/sample-project/` using HTTPS:
```shell ```shell
git clone https://gitlab.com/gitlab-tests/sample-project.git git clone https://gitlab.com/gitlab-tests/sample-project.git
``` ```
NOTE: NOTE:
On Windows, if you entered incorrect passwords multiple times and GitLab is responding `Access denied`, On Windows, if you enter your password incorrectly multiple times and GitLab is responding `Access denied`,
you may have to add your namespace (user name or group name) to clone through HTTPS: add your namespace (username or group):
`git clone https://namespace@gitlab.com/gitlab-org/gitlab.git`. `git clone https://namespace@gitlab.com/gitlab-org/gitlab.git`.
#### Clone via SSH #### Clone using SSH
To clone `git@gitlab.com:gitlab-org/gitlab.git` via SSH: To clone `git@gitlab.com:gitlab-org/gitlab.git` using SSH:
```shell ```shell
git clone git@gitlab.com:gitlab-org/gitlab.git git clone git@gitlab.com:gitlab-org/gitlab.git
...@@ -257,8 +247,8 @@ git clone git@gitlab.com:gitlab-org/gitlab.git ...@@ -257,8 +247,8 @@ git clone git@gitlab.com:gitlab-org/gitlab.git
When you have your files in a local folder and want to convert it into When you have your files in a local folder and want to convert it into
a repository, you must _initialize_ the folder through the `git init` a repository, you must _initialize_ the folder through the `git init`
command. This instructs Git to begin to track that directory as a command. This command instructs Git to track that directory as a
repository. To do so, open the terminal on the directory you'd like to convert repository. Open the terminal in the directory you'd like to convert
and run: and run:
```shell ```shell
...@@ -269,15 +259,14 @@ This command creates a `.git` folder in your directory that contains Git ...@@ -269,15 +259,14 @@ This command creates a `.git` folder in your directory that contains Git
records and configuration files. We advise against editing these files records and configuration files. We advise against editing these files
directly. directly.
Then, on the next step, add the [path to your remote repository](#add-a-remote-repository) Following the steps in the next section, add the [path to your remote repository](#add-a-remote-repository)
so that Git can upload your files into the correct project. so that Git can upload your files into the correct project.
#### Add a remote repository #### Add a remote repository
By "adding a remote repository" to your local directory you tell Git that You add a remote repository to tell Git which remote project in GitLab is tied
the path to that specific project in GitLab corresponds to that specific to the specific local folder on your computer.
folder you have in your computer. This way, your local folder is The remote tells Git where to push or pull from.
identified by Git as the local content for that specific remote project.
To add a remote repository to your local copy: To add a remote repository to your local copy:
...@@ -293,8 +282,7 @@ After you've done that, you can [stage your files](#add-and-commit-local-changes ...@@ -293,8 +282,7 @@ After you've done that, you can [stage your files](#add-and-commit-local-changes
### Download the latest changes in the project ### Download the latest changes in the project
To work on an up-to-date copy of the project (it is important to do this every time To work on an up-to-date copy of the project, you `pull` to get all the changes made by users
you start working on a project), you `pull` to get all the changes made by users
since the last time you cloned or pulled the project. Replace `<name-of-branch>` since the last time you cloned or pulled the project. Replace `<name-of-branch>`
with the name of your [default branch](../user/project/repository/branches/default.md) with the name of your [default branch](../user/project/repository/branches/default.md)
to get the main branch code, or replace it with the branch name of the branch to get the main branch code, or replace it with the branch name of the branch
...@@ -331,16 +319,15 @@ to work on a different **branch**. ...@@ -331,16 +319,15 @@ to work on a different **branch**.
When you create a branch in a Git repository, you make a copy of its files at the time of branching. You're free When you create a branch in a Git repository, you make a copy of its files at the time of branching. You're free
to do whatever you want with the code in your branch without impacting the main branch or other branches. And when to do whatever you want with the code in your branch without impacting the main branch or other branches. And when
you're ready to bring your changes to the main codebase, you can merge your branch into the default branch you're ready to add your changes to the main codebase, you can merge your branch into the default branch
used in your project (such as `main`). used in your project (such as `main`).
A new branch is often called **feature branch** to differentiate from the A new branch is often called **feature branch** to differentiate from the
[default branch](../user/project/repository/branches/default.md). [default branch](../user/project/repository/branches/default.md).
### Create a branch ### Create and work in a branch
To create a new feature branch and work from without affecting the default To create a new feature branch to work with:
branch:
```shell ```shell
git checkout -b <name-of-branch> git checkout -b <name-of-branch>
...@@ -350,56 +337,56 @@ Note that Git does **not** accept empty spaces and special characters in branch ...@@ -350,56 +337,56 @@ Note that Git does **not** accept empty spaces and special characters in branch
names, so use only lowercase letters, numbers, hyphens (`-`), and underscores names, so use only lowercase letters, numbers, hyphens (`-`), and underscores
(`_`). Do not use capital letters, as it may cause duplications. (`_`). Do not use capital letters, as it may cause duplications.
### Switch to the default branch ### Switch to a branch
You are always in a branch when working with Git. The
[default branch](../user/project/repository/branches/default.md) can vary depending
on your version of GitLab, but you can alter this command to switch to a different branch by
changing `main` to the branch name:
```shell
git checkout main
```
### Work on an existing branch You are always in a branch when working with Git.
You can switch between branches to see the state of the files and work in that branch.
To switch to an existing branch, so you can work on it: To switch to an existing branch:
```shell ```shell
git checkout <name-of-branch> git checkout <name-of-branch>
``` ```
### View the changes you've made For example, to change to the `main` branch:
It's important to be aware of what's happening and the status of your changes. When
you add, change, or delete files/folders, Git knows about it. To check the status of
your changes:
```shell ```shell
git status git checkout main
``` ```
### View differences ### View differences
To view the differences between your local, unstaged changes and the repository versions To view the differences between your local, unstaged changes and the latest version
that you cloned or pulled, type: that you cloned or pulled, type:
```shell ```shell
git diff git diff
``` ```
### View the files that have changes
It's important to be aware of what's happening and the status of your changes. When
you add, change, or delete files or folders, Git knows about the changes.
To check which files have been changed use:
```shell
git status
```
### Add and commit local changes ### Add and commit local changes
Local changes are shown in red when you type `git status`. These changes may Locally changed files are shown in red when you type `git status`. These changes may
be new, modified, or deleted files/folders. Use `git add` to first stage (prepare) be new, modified, or deleted files/folders. Use `git add` to **stage** (prepare)
a local file/folder for committing. Then use `git commit` to commit (save) the staged a local file/folder for committing. Then use `git commit` to commit (save) the staged files.
files:
```shell ```shell
git add <file-name OR folder-name> git add <file-name OR folder-name>
git commit -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT" git commit -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT"
``` ```
To add more than one file or folder, repeat `git add` for each file or folder you want included
in the commit command before using `git commit`. Files that have been added show green when using `git status`.
#### Add all changes to commit #### Add all changes to commit
To add and commit (save) all local changes quickly: To add and commit (save) all local changes quickly:
...@@ -412,6 +399,12 @@ git commit -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT" ...@@ -412,6 +399,12 @@ git commit -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT"
NOTE: NOTE:
The `.` character means _all file changes in the current directory and all subdirectories_. The `.` character means _all file changes in the current directory and all subdirectories_.
To run `git add .` as part of the commit command, use the `-a` option:
```shell
git commit -a -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT"
```
### Send changes to GitLab.com ### Send changes to GitLab.com
To push all local commits (saved changes) to the remote repository: To push all local commits (saved changes) to the remote repository:
...@@ -420,7 +413,7 @@ To push all local commits (saved changes) to the remote repository: ...@@ -420,7 +413,7 @@ To push all local commits (saved changes) to the remote repository:
git push <remote> <name-of-branch> git push <remote> <name-of-branch>
``` ```
For example, to push your local commits to the _`main`_ branch of the _`origin`_ remote: For example, to push your local commits to the `main` branch of the `origin` remote:
```shell ```shell
git push origin main git push origin main
...@@ -435,21 +428,21 @@ To create a merge request from a fork to an upstream repository, see the ...@@ -435,21 +428,21 @@ To create a merge request from a fork to an upstream repository, see the
### Delete all changes in the branch ### Delete all changes in the branch
To delete all local changes in the branch that have not been added to the staging To discard all changes of tracked files, type:
area, and leave unstaged files/folders, type:
```shell ```shell
git checkout . git checkout .
``` ```
Note that this removes *changes* to files, not the files themselves. Note that this removes *changes* to files, not the files themselves.
Any untracked (new) files are untouched.
### Unstage all changes that have been added to the staging area ### Unstage all changes that have been added to the staging area
To undo the most recently added, but not committed, changes to files/folders: To unstage (remove) all files that have not been committed from being committed, use:
```shell ```shell
git reset . git reset
``` ```
### Undo most recent commit ### Undo most recent commit
...@@ -463,10 +456,13 @@ git reset HEAD~1 ...@@ -463,10 +456,13 @@ git reset HEAD~1
This leaves the changed files and folders unstaged in your local repository. This leaves the changed files and folders unstaged in your local repository.
WARNING: WARNING:
A Git commit should not usually be reversed, particularly if you already pushed it A Git commit should not be reversed if you already pushed it
to the remote repository. Although you can undo a commit, the best option is to avoid to the remote repository. Although you can undo a commit, the best option is to avoid
the situation altogether by working carefully. the situation altogether by working carefully.
You can learn more about the different ways Git can undo changes in the
[Git Undoing Things documentation](https://git-scm.com/book/en/v2/Git-Basics-Undoing-Things).
### Merge a branch with default branch ### Merge a branch with default branch
When you are ready to make all the changes in a branch a permanent addition to When you are ready to make all the changes in a branch a permanent addition to
...@@ -478,6 +474,8 @@ git checkout <feature-branch> ...@@ -478,6 +474,8 @@ git checkout <feature-branch>
git merge <default-branch> git merge <default-branch>
``` ```
In GitLab, you typically merge using a [merge request](../user/project/merge_requests/) instead of performing the command locally.
## Advanced use of Git through the command line ## Advanced use of Git through the command line
For an introduction of more advanced Git techniques, see [Git rebase, force-push, and merge conflicts](../topics/git/git_rebase.md). For an introduction of more advanced Git techniques, see [Git rebase, force-push, and merge conflicts](../topics/git/git_rebase.md).
...@@ -487,7 +485,7 @@ For an introduction of more advanced Git techniques, see [Git rebase, force-push ...@@ -487,7 +485,7 @@ For an introduction of more advanced Git techniques, see [Git rebase, force-push
[Forking a repository](../user/project/repository/forking_workflow.md) lets you create [Forking a repository](../user/project/repository/forking_workflow.md) lets you create
a copy of a repository in your namespace. Changes made to your copy of the repository a copy of a repository in your namespace. Changes made to your copy of the repository
are not synchronized automatically with the original. are not synchronized automatically with the original.
Your local fork (copy) contains changes made by you only, so to keep the project Your local fork (copy) only contains changes you have made, so to keep the project
in sync with the original project, you need to `pull` from the original repository. in sync with the original project, you need to `pull` from the original repository.
You must [create a link to the remote repository](#add-a-remote-repository) to pull You must [create a link to the remote repository](#add-a-remote-repository) to pull
......
doc/user/project/repository/branches/index.md
View file @ a2419c26
...@@ -33,7 +33,7 @@ For more information on managing branches using the GitLab UI, see: ...@@ -33,7 +33,7 @@ For more information on managing branches using the GitLab UI, see:
- [Branch filter search box](#branch-filter-search-box) - [Branch filter search box](#branch-filter-search-box)
You can also manage branches using the You can also manage branches using the
[command line](../../../../gitlab-basics/start-using-git.md#create-a-branch). [command line](../../../../gitlab-basics/start-using-git.md#create-and-work-in-a-branch).
<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>Watch the video [GitLab Flow](https://www.youtube.com/watch?v=InKNIvky2KE). <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>Watch the video [GitLab Flow](https://www.youtube.com/watch?v=InKNIvky2KE).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7