2019-07-30 05:02:59 +00:00
---
2020-07-29 12:09:45 +00:00
stage: Create
group: Source Code
2020-11-26 06:09:20 +00:00
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
2019-07-30 05:02:59 +00:00
type: howto, tutorial
2020-04-24 15:09:37 +00:00
description: "Introduction to using Git through the command line."
2019-07-30 05:02:59 +00:00
---
2015-07-09 22:33:42 +00:00
# Start using Git on the command line
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
[Git ](https://git-scm.com/ ) is an open-source distributed version control system designed to
handle everything from small to very large projects with speed and efficiency. GitLab is built
on top of Git.
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
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
tasks.
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
For example, if you need to fix complex merge conflicts, rebase branches,
merge manually, or undo and roll back commits, you'll need to use Git from
the command line and then push your changes to the remote server.
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
This guide will help you get started with Git through the command line and can be your reference
for Git commands in the future. If you're only looking for a quick reference of Git commands, you
2020-12-16 03:09:46 +00:00
can download the GitLab [Git Cheat Sheet ](https://about.gitlab.com/images/press/git-cheat-sheet.pdf ).
2015-06-17 16:44:48 +00:00
2020-06-02 09:08:01 +00:00
> For more information about the advantages of working with Git and GitLab:
>
2020-06-09 06:08:43 +00:00
> - <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.
2020-06-02 09:08:01 +00:00
> - Learn how GitLab became the backbone of [Worldline](https://about.gitlab.com/customers/worldline/)’ s development environment.
2020-12-08 03:09:37 +00:00
NOTE:
2020-04-24 15:09:37 +00:00
To help you visualize what you're doing locally, there are
[Git GUI apps ](https://git-scm.com/download/gui/ ) you can install.
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
## Requirements
2018-06-13 13:54:23 +00:00
2020-04-24 15:09:37 +00:00
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
connection between the files in your computer and their version on a remote server.
You'll also need to open a [command shell ](#command-shell ) and have
[Git installed ](#install-git ) in your computer.
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
### Command shell
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
To execute Git commands in your computer, you'll need to open a command shell (also known as command
prompt, terminal, and command line) of your preference. Here are some suggestions:
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
- 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.
2020-12-04 00:09:55 +00:00
- [iTerm2 ](https://iterm2.com/ ), which you can integrate with [zsh ](https://git-scm.com/book/id/v2/Appendix-A%3A-Git-in-Other-Environments-Git-in-Zsh ) and [oh my zsh ](https://ohmyz.sh/ ) for color highlighting, among other handy features for Git users.
2020-04-24 15:09:37 +00:00
- For Windows users:
- Built-in: **cmd** . Click the search icon on the bottom navbar on Windows and type "cmd" to find it.
2020-06-05 00:08:38 +00:00
- [PowerShell ](https://docs.microsoft.com/en-us/powershell/scripting/windows-powershell/install/installing-windows-powershell?view=powershell-7 ): a Windows "powered up" shell, from which you can execute a greater number of commands.
2020-04-24 15:09:37 +00:00
- Git Bash: it comes built into [Git for Windows ](https://gitforwindows.org/ ).
- For Linux users:
- Built-in: [Linux Terminal ](https://www.howtogeek.com/140679/beginner-geek-how-to-start-using-the-linux-terminal/ ).
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
### Install Git
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
Open a command shell and run the following command to check if Git is already installed in your
computer:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2020-04-24 15:09:37 +00:00
git --version
2015-06-17 16:44:48 +00:00
```
2020-04-24 15:09:37 +00:00
If you have Git installed, the output will be:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2020-04-24 15:09:37 +00:00
git version X.Y.Z
2015-06-17 16:44:48 +00:00
```
2020-04-24 15:09:37 +00:00
If your computer doesn't recognize `git` as a command, you'll need to [install Git ](../topics/git/how_to_install_git/index.md ).
After that, run `git --version` again to verify whether it was correctly installed.
2018-06-13 13:54:23 +00:00
2020-04-24 15:09:37 +00:00
## Configure Git
To start using Git from your computer, you'll need to enter your credentials (user name and email)
to identify you as the author of your work. The user name and email should match the ones you're
using on GitLab.
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
In your shell, add your user name:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2020-04-24 15:09:37 +00:00
git config --global user.name "your_username"
2015-06-17 16:44:48 +00:00
```
2020-04-24 15:09:37 +00:00
And your email address:
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
```shell
git config --global user.email "your_email_address@example.com"
```
2015-06-17 16:44:48 +00:00
2020-04-24 15:09:37 +00:00
To check the configuration, run:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2015-06-17 16:44:48 +00:00
git config --global --list
```
2018-06-13 13:54:23 +00:00
2020-04-24 15:09:37 +00:00
The `--global` option tells Git to always use this information for anything you do on your system.
If you omit `--global` or use `--local` , the configuration will be applied only to the current
repository.
You can read more on how Git manages configurations in the
2020-12-11 06:10:17 +00:00
[Git configuration documentation ](https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration ).
2020-04-24 15:09:37 +00:00
2020-06-30 18:09:13 +00:00
## Git authentication methods
2016-03-22 10:01:13 +00:00
2020-06-30 18:09:13 +00:00
To connect your computer with GitLab, you need to add your credentials to identify yourself.
You have two options:
2019-01-23 17:09:19 +00:00
2020-06-30 18:09:13 +00:00
- Authenticate on a project-by-project basis through HTTPS, and enter your credentials every time
you perform an operation between your computer and GitLab.
- Authenticate through SSH once and GitLab won't ask your credentials every time you pull, push,
and clone.
2019-05-19 20:47:32 +00:00
2020-06-30 18:09:13 +00:00
To start the authentication process, we'll [clone ](#clone-a-repository ) an existing repository
to our computer:
2019-05-19 20:47:32 +00:00
2020-06-30 18:09:13 +00:00
- If you want to use **SSH** to authenticate, follow the instructions on the [SSH documentation ](../ssh/README.md )
to set it up before cloning.
- If you want to use **HTTPS** , GitLab will request your user name and password:
- If you have 2FA enabled for your account, you'll have to use a [Personal Access Token ](../user/profile/personal_access_tokens.md )
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.
2019-05-19 20:47:32 +00:00
2020-12-04 21:09:29 +00:00
NOTE:
2020-12-16 03:09:46 +00:00
Authenticating via SSH is the GitLab recommended method. You can read more about credential storage
2020-06-30 18:09:13 +00:00
in the [Git Credentials documentation ](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage ).
2019-05-19 20:47:32 +00:00
2020-06-30 18:09:13 +00:00
## Git terminology
2019-05-19 20:47:32 +00:00
2020-06-30 18:09:13 +00:00
If you're familiar with the Git terminology, you may want to jump directly
into the [basic commands ](#basic-git-commands ).
### 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
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
GitLab and the copy in your computer is called **local** copy.
A **project** in GitLab is what holds a repository, which holds your files.
Often, the word "repository" is shortened to "repo".
### 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'll create a copy of the project into your own
namespace to have read and write permissions to modify the project files
and settings.
For example, if you fork this project, < https: / / gitlab . com / gitlab-tests / sample-project / > into your namespace, you'll 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,
work on its files, and (optionally) submit proposed changes back to the
original repository if you'd like.
### Download vs clone
2019-01-23 16:16:48 +00:00
2020-12-23 18:10:19 +00:00
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
2020-06-30 18:09:13 +00:00
remote repository on GitLab.
2019-01-23 16:16:48 +00:00
2020-12-23 18:10:19 +00:00
Cloning 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
upload the changes to the remote repository on GitLab.
2020-06-30 18:09:13 +00:00
### Pull and push
After you saved a local copy of a repository and modified its 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
[`git push` ](#send-changes-to-gitlabcom ).
When the remote repository changes, your local copy will be behind it. You can update it with the new
2020-12-11 06:10:17 +00:00
changes in the remote repository.
2020-06-30 18:09:13 +00:00
This is referred to as **pulling** from GitLab, as this is achieved by the command
[`git pull` ](#download-the-latest-changes-in-the-project ).
## Basic Git commands
For the purposes of this guide, we will use this example project on GitLab.com:
[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
namespace to have your own copy to playing with. Your sample
project will be available under `https://gitlab.com/<your-namespace>/sample-project/` .
You can also choose any other project to follow this guide. Then, replace the
example URLs with your own project's.
If you want to start by copying an existing GitLab repository onto your
computer, see how to [clone a repository ](#clone-a-repository ). On the other
hand, if you want to start by uploading an existing folder from your computer
to GitLab, see how to [convert a local folder into a Git repository ](#convert-a-local-directory-into-a-repository ).
### Clone a repository
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 ) or [SSH ](#clone-via-ssh ), according to your preferred [authentication method ](#git-authentication-methods ).
2019-01-23 16:16:48 +00:00
2019-07-30 05:02:59 +00:00
You can find both paths (HTTPS and SSH) by navigating to your project's landing page
and clicking **Clone** . GitLab will prompt you with both paths, from which you can copy
2019-01-23 16:16:48 +00:00
and paste in your command line.
2020-06-30 18:09:13 +00:00
For example, considering our [sample project ](https://gitlab.com/gitlab-tests/sample-project/ ):
2019-01-23 16:16:48 +00:00
2020-06-30 18:09:13 +00:00
- 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` .
2019-01-23 16:16:48 +00:00
2020-06-30 18:09:13 +00:00
To get started, open a terminal window in the directory you wish to add the
2020-04-24 21:09:48 +00:00
repository files into, and run one of the `git clone` commands as described below.
2019-01-23 16:16:48 +00:00
2020-04-24 21:09:48 +00:00
Both commands will download a copy of the files in a folder named after the project's
2020-06-30 18:09:13 +00:00
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
locally.
2020-04-24 21:09:48 +00:00
#### Clone via HTTPS
2020-06-30 18:09:13 +00:00
To clone `https://gitlab.com/gitlab-tests/sample-project/` via HTTPS:
2019-01-17 22:07:07 +00:00
2020-01-30 15:09:15 +00:00
```shell
2020-06-30 18:09:13 +00:00
git clone https://gitlab.com/gitlab-tests/sample-project.git
2019-01-17 22:07:07 +00:00
```
2020-12-08 03:09:37 +00:00
NOTE:
2020-04-24 21:09:48 +00:00
On Windows, if you entered incorrect passwords multiple times and GitLab is responding `Access denied` ,
you may have to add your namespace (user name or group name) to clone through HTTPS:
`git clone https://namespace@gitlab.com/gitlab-org/gitlab.git` .
#### Clone via SSH
To clone `git@gitlab.com:gitlab-org/gitlab.git` via SSH:
2019-01-17 22:07:07 +00:00
2020-01-30 15:09:15 +00:00
```shell
2019-09-18 18:06:14 +00:00
git clone git@gitlab.com:gitlab-org/gitlab.git
2019-01-17 22:07:07 +00:00
```
2019-01-23 16:16:48 +00:00
2020-06-30 18:09:13 +00:00
### Convert a local directory into a repository
2019-07-30 05:02:59 +00:00
2020-06-30 18:09:13 +00:00
When you have your files in a local folder and want to convert it into
a repository, you'll need to _initialize_ the folder through the `git init`
command. This will instruct Git to begin to track that directory as a
repository. To do so, open the terminal on the directory you'd like to convert
and run:
2016-03-22 10:01:13 +00:00
2020-01-30 15:09:15 +00:00
```shell
2020-06-30 18:09:13 +00:00
git init
2016-03-22 10:01:13 +00:00
```
2020-06-30 18:09:13 +00:00
This command creates a `.git` folder in your directory that contains Git
records and configuration files. We advise against editing these files
directly.
Then, on the next step, add the [path to your remote repository ](#add-a-remote-repository )
so that Git can upload your files into the correct project.
#### Add a remote repository
By "adding a remote repository" to your local directory you'll tell Git that
the path to that specific project in GitLab corresponds to that specific
folder you have in your computer. This way, your local folder will be
identified by Git as the local content for that specific remote project.
To add a remote repository to your local copy:
1. In GitLab, [create a new project ](../gitlab-basics/create-project.md#push-to-create-a-new-project ) to hold your files.
1. Visit this project's homepage, scroll down to **Push an existing folder** , and copy the command that starts with `git remote add` .
1. On your computer, open the terminal in the directory you've initialized, paste the command you copied, and press < kbd > enter</ kbd > :
```shell
2020-12-01 00:09:28 +00:00
git remote add origin git@gitlab.com:username/projectpath.git
2020-06-30 18:09:13 +00:00
```
After you've done that, you can [stage your files ](#add-and-commit-local-changes ) and [upload them to GitLab ](#send-changes-to-gitlabcom ).
2016-03-22 10:01:13 +00:00
### Download the latest changes in the project
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
To work on an up-to-date copy of the project (it is important to do this every time
2019-11-27 09:06:29 +00:00
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. Use `master` for the
`<name-of-branch>` to get the main branch code, or the branch name of the branch
you are currently working in.
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2019-08-21 09:17:47 +00:00
git pull < REMOTE > < name-of-branch >
2016-03-22 10:01:13 +00:00
```
2018-06-13 13:54:23 +00:00
2019-08-21 09:17:47 +00:00
When you clone a repository, `REMOTE` is typically `origin` . This is where the
2019-07-30 05:02:59 +00:00
repository was cloned from, and it indicates the SSH or HTTPS URL of the repository
2019-11-27 09:06:29 +00:00
on the remote server. `<name-of-branch>` is usually `master` , but it may be any
existing branch. You can create additional named remotes and branches as necessary.
2019-08-21 09:17:47 +00:00
2019-11-27 09:06:29 +00:00
You can learn more on how Git manages remote repositories in the
[Git Remote documentation ](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes ).
2018-06-13 13:54:23 +00:00
### View your remote repositories
To view your remote repositories, type:
2020-01-30 15:09:15 +00:00
```shell
2018-06-13 13:54:23 +00:00
git remote -v
2016-03-22 10:01:13 +00:00
```
2019-08-26 20:31:04 +00:00
The `-v` flag stands for verbose.
2019-08-21 09:17:47 +00:00
2020-06-30 18:09:13 +00:00
## Branching
2019-05-19 20:47:32 +00:00
2020-06-30 18:09:13 +00:00
If you want to add code to a project but you're not sure if it will work properly, or you're
collaborating on the project with others, and don't want your work to get mixed up, it's a good idea
to work on a different **branch** .
2019-05-19 20:47:32 +00:00
2020-06-30 18:09:13 +00:00
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
2020-10-13 12:08:41 +00:00
you're ready to bring your changes to the main codebase, you can merge your branch into the default branch
2020-06-30 18:09:13 +00:00
used in your project (such as `master` ).
2019-05-19 20:47:32 +00:00
2020-10-13 12:08:41 +00:00
A new branch is often called **feature branch** to differentiate from the
**default branch**.
2016-03-22 10:01:13 +00:00
### Create a branch
2018-06-13 13:54:23 +00:00
2020-10-13 12:08:41 +00:00
To create a new feature branch and work from without affecting the `master`
branch:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2019-08-21 09:17:47 +00:00
git checkout -b < name-of-branch >
2016-03-22 10:01:13 +00:00
```
2020-10-13 12:08:41 +00:00
Note that Git does **not** accept empty spaces and special characters in branch
names, so use only lowercase letters, numbers, hyphens (`-`), and underscores
(`_`). Do not use capital letters, as it may cause duplications.
2020-06-30 18:09:13 +00:00
### Switch to the master branch
You are always in a branch when working with Git. The main branch is the master
branch, but you can use the same command to switch to a different branch by
changing `master` to the branch name.
```shell
git checkout master
```
2018-06-13 13:54:23 +00:00
### Work on an existing branch
To switch to an existing branch, so you can work on it:
2020-01-30 15:09:15 +00:00
```shell
2019-07-30 05:02:59 +00:00
git checkout < name-of-branch >
2016-03-22 10:01:13 +00:00
```
### View the changes you've made
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
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:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2016-03-22 10:01:13 +00:00
git status
```
2018-06-13 13:54:23 +00:00
### View differences
2019-07-30 05:02:59 +00:00
To view the differences between your local, unstaged changes and the repository versions
that you cloned or pulled, type:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2018-06-13 13:54:23 +00:00
git diff
```
### Add and commit local changes
2019-07-30 05:02:59 +00:00
You'll see any local changes in red when you type `git status` . These changes may
be new, modified, or deleted files/folders. Use `git add` to first stage (prepare)
a local file/folder for committing. Then use `git commit` to commit (save) the staged
files:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2019-07-30 05:02:59 +00:00
git add < file-name OR folder-name >
2018-06-13 13:54:23 +00:00
git commit -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT"
2016-03-22 10:01:13 +00:00
```
2018-06-13 13:54:23 +00:00
2020-06-30 18:09:13 +00:00
#### Add all changes to commit
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
To add and commit (save) all local changes quickly:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2018-06-13 13:54:23 +00:00
git add .
git commit -m "COMMENT TO DESCRIBE THE INTENTION OF THE COMMIT"
2016-03-22 10:01:13 +00:00
```
2020-12-04 21:09:29 +00:00
NOTE:
2019-08-21 09:17:47 +00:00
The `.` character means _all file changes in the current directory and all subdirectories_ .
2018-06-13 13:54:23 +00:00
2019-05-19 20:47:32 +00:00
### Send changes to GitLab.com
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
To push all local commits (saved changes) to the remote repository:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2019-07-30 05:02:59 +00:00
git push < remote > < name-of-branch >
2016-03-22 10:01:13 +00:00
```
2019-07-30 05:02:59 +00:00
For example, to push your local commits to the _`master`_ branch of the _`origin`_ remote:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2018-06-13 13:54:23 +00:00
git push origin master
2016-03-22 10:01:13 +00:00
```
2018-06-13 13:54:23 +00:00
2020-10-13 12:08:41 +00:00
On certain occasions, Git won't allow you to push to your repository, and then
you'll need to [force an update ](../topics/git/git_rebase.md#force-push ).
2020-12-04 21:09:29 +00:00
NOTE:
2020-06-30 18:09:13 +00:00
To create a merge request from a fork to an upstream repository, see the
[forking workflow ](../user/project/repository/forking_workflow.md ).
2019-07-30 05:02:59 +00:00
### Delete all changes in the branch
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
To delete all local changes in the branch that have not been added to the staging
area, and leave unstaged files/folders, type:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2016-03-22 10:01:13 +00:00
git checkout .
```
2019-07-30 05:02:59 +00:00
Note that this removes *changes* to files, not the files themselves.
2016-03-22 10:01:13 +00:00
2018-06-13 13:54:23 +00:00
### Unstage all changes that have been added to the staging area
2019-07-30 05:02:59 +00:00
To undo the most recently added, but not committed, changes to files/folders:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2018-06-13 13:54:23 +00:00
git reset .
```
### Undo most recent commit
To undo the most recent commit, type:
2020-01-30 15:09:15 +00:00
```shell
2018-06-13 13:54:23 +00:00
git reset HEAD~1
```
2019-07-30 05:02:59 +00:00
This leaves the changed files and folders unstaged in your local repository.
2018-06-13 13:54:23 +00:00
2020-12-04 21:09:29 +00:00
WARNING:
2019-11-14 18:06:15 +00:00
A Git commit should not usually be reversed, particularly if you already pushed it
2019-07-30 05:02:59 +00:00
to the remote repository. Although you can undo a commit, the best option is to avoid
the situation altogether by working carefully.
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
### Merge a branch with master branch
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
When you are ready to make all the changes in a branch a permanent addition to
the master branch, you `merge` the two together:
2018-06-13 13:54:23 +00:00
2020-01-30 15:09:15 +00:00
```shell
2019-07-30 05:02:59 +00:00
git checkout < name-of-branch >
2016-03-22 10:01:13 +00:00
git merge master
```
2016-07-21 16:49:40 +00:00
2020-10-13 12:08:41 +00:00
## 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 ).
2020-06-30 18:09:13 +00:00
## Synchronize changes in a forked repository with the upstream
2019-11-27 09:06:29 +00:00
2019-12-20 09:24:38 +00:00
[Forking a repository ](../user/project/repository/forking_workflow.md ) lets you create
2019-11-27 09:06:29 +00:00
a copy of a repository in your namespace. Changes made to your copy of the repository
are not synchronized automatically with the original.
Your local fork (copy) contains changes made by you only, so to keep the project
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
changes from the original repository. It is common to call this remote the `upstream` .
You can now use the `upstream` as a [`<remote>` to `pull` new updates ](#download-the-latest-changes-in-the-project )
from the original repository, and use the `origin`
to [push local changes ](#send-changes-to-gitlabcom ) and create merge requests.
2019-07-30 05:02:59 +00:00
<!-- ## Troubleshooting
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
2018-06-13 13:54:23 +00:00
2019-07-30 05:02:59 +00:00
Each scenario can be a third-level heading, e.g. `### Getting error message X` .
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->