mirror of
https://codeberg.org/Mo8it/How_To_Linux.git
synced 2024-11-21 14:48:02 +00:00
Update notes.md with git merge
This commit is contained in:
parent
8e46045b01
commit
9a0b90063c
1 changed files with 9 additions and 15 deletions
|
@ -4,21 +4,6 @@ The participants of the course will add a description to each of these Git subco
|
|||
|
||||
## 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 clone
|
||||
|
@ -61,6 +46,15 @@ if you want to stage all changes.
|
|||
|
||||
## 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 revert
|
||||
|
|
Loading…
Reference in a new issue