Git and GitLab

Git

Install git on your computer.

Check git version on your computer:
```
        git --version
      
```

Configure git:

        git config --global user.name "Your Name"
        git config --global user.email "hello@example.com"

[Optional] Configure the default branch name to use in all your repositories:

        git config --global init.Branch <name> 
    Example: 
        git config --global init.Branch main

Create a new Git Repository in the current folder:
```
        git init
      
```
Just-created branch can be renamed via this command:
```
    
        git branch -m main
      
```
Create one file in the main branch in order to create a new branch for development of features:
```
        touch <file_name>
      
```

Create a new branch and switch to the new branch:

        git branch <branch name>
        git checkout <branch name>
      Example:
        git branch feature-1
        git checkout feature-1

Add the file(s) to the staging area:

        git add .
    OR
        git add <file name>

Discard changes to the file(s) in the staging area:

              
        git restore <file name>
        Or check this command:
        git reset HEAD <file name>

Commit the changes:

        git commit -m <message what was changed in the code>
    Example:
        git commit -m "Initial Commit"

Check status of the repository:
```
        git status
      
```
See the history of the repository, pointer of the HEAD and list of commits:
```
        git log
      
```
See the history of all branches of the repository in a nice one line summary and a pointer of the HEAD:
```
        git log --all --oneline
      
```

Switch to the new branch:

        git checkout <branch name>
      Example:              
        git checkout main
        OR
        git checkout feature-1

Merge the source branch into the target (for example the main) branch:

  Checkout the target branch:

        git checkout <target branch name>

  Merge the source branch into the target branch:

        git merge <source branch name>

      Example:
        git checkout main
        git merge feature-1

Delete a branch:

        git branch -d <branch name>
      Example:
        git branch -d feature-1

Stash
- Stash changes and see the list of stashes:
```
        git stash push
        git stash list
      
```
- git stash apply
- git stash drop
- git stash pop
- git stash clear
- git stash branch <branch name>

Push the changes to the remote repository:

        git push origin <branch name>

Check the status of the remote repository:
```
        git remote -v
      
```

How to undo Merge Request
1. In GitLab GUI close Merge Request.
2. In the GitBash:
  1. Make sure you are in your branch
  2. git fetch origin
  3. git reset --hard origin/main
  4. git push -f origin MY_BRANCH_NAME
Source: Reset local repository branch to be just like remote repository HEAD

GitLab
1. Create GitLab account at GitLab.
2. Create a SSH key pair for GitLab.
```
    Open GitBash on C:\Users\raya\.ssh
    ssh-keygen -t ed25519 -C <your email> 
    Set to save it in the same folder under id_rsa_my_hight_pro
    New key will be saved in id_rsa_my_hight_pro* files
    
    ssh-keygen -t ed25519 -C "GitLab Key Pair" 
          Pay attention to the name of the file
  OR
    ssh-keygen -t rsa -b 4096 -C <your email>
  
```
3. Add the SSH public key to a GitLab profile at GitLab SSH Keys.
```
      cat ~/.ssh/id_ed25519.pub
      Copy the output to the clipboard.
      Paste in the key field in the GitLab profile at GitLab SSH Keys.          
      Press on the Add Key.
          
```
4. Verify the SSH key pair is working with GitLab:
```
      ssh -T git@gitlab.com
          
```
  Expected result: "Welcome to Gitlab <username>" message.
Key GitLab Terms: Merge request A request to merge one branch into another.


    Based on this video.
    About GitLab flow see at 1:09:00 in the video.

Git and GitLab

How to undo Merge Request