mo8it/How_To_Linux
1
0
Fork 0
mirror of https://codeberg.org/Mo8it/How_To_Linux.git synced 2024-11-21 19:18:02 +00:00
Code Releases Activity

Update notes.md with git merge

Browse source
This commit is contained in:
Max 2023-08-17 11:36:23 +02:00
parent 8e46045b01
commit 9a0b90063c
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/day_3/notes.md
View file

@ -4,21 +4,6 @@ The participants of the course will add a description to each of these Git subco
## git config ## git config
This command is used to pass information onto git.
Example:
```bash
$ git config --global user.name "USERNAME"
```
and
```bash
$ git config --global user.email "EMAIL"
```
## git init ## git init
## git clone ## git clone
@ -61,6 +46,15 @@ if you want to stage all changes.
## git merge ## git merge
This command is used to combine two branches together. Use git checkout to visit the branch you want to merge to.
```bash
$ git checkout main
$ git merge branch2
```
This will merge the branch "branch2" into the branch, where this command was executed in.(Here: "main")
## git reset ## git reset
## git revert ## git revert