@@ -38,17 +38,70 @@ Notice that Git mentions that the `README.md` and the `imaginary.md` files have
### Notifying Git which changes have to be included in the next commit.
Git has to be explicitely made aware of what changes you want to include in the next commit. For files that have been modified or new files, this is done with the `git add`[command](https://git-scm.com/docs/git-add). When `git add` is followed by a file name, this file will be included in the next commit. When `git add` is followed by a folder or directory name, each file it contains will be included in the next commit.
Git has to be explicitely made aware of what changes you want to include in the next commit.
#### Notifying Git that files have been added or modified.
For files that have been modified or new files, this is done with the `git add`[command](https://git-scm.com/docs/git-add). When `git add` is followed by a file name, this file will be included in the next commit. When `git add` is followed by a folder or directory name, each file it contains will be included in the next commit.
After using Git add on the modified and new files of the repository, this is what the output of `git status` looks like.
1. Using `git add` on an empty directory has no effects : Git does not manage empty directories.
1. If you edit a file for which you already did `git add`, you will need to do the `git add` again.
### Deleting files tracked by Git
The `git rm`[command](https://git-scm.com/docs/git-rm) will have a double effect:
1. It will remove a file (or a set of files) from the local copy of the repository
2. It will notify Git that it should not track this (these) file(s) anymore.
When using `git rm` to remove a directory, only files known to Git will be removed.
#### Important note
If you remove one or more files with the Linux `rm` command. Git will require that you also use `git rm` to notify that you no longer want to keep track of the file(s). Better to use `git rm` in the first place.
### Renaming / Moving files tracked by Git
The `git mv`[command](https://git-scm.com/docs/git-mv) allows you to rename or move a file or a folder.
#### Important note.
If you rename one or more files with the Linux `mv` command. Git will be tricked and believe that first you deleted the old file and then that a new appeared instead. As above, better to use `git mv` in the first place.
### Undoing changes to files since the latest commit.
Sometimes, you will want to undo the changes you made to one or several files since your last commit. This can easily be achieved with the `git restore`[command](https://git-scm.com/docs/git-restore). You can also use `git restore` to recover files you accidentally deleted with the Linux `rm` command (or using your system's trash can).
## Committing changes to a local repository.
Once you checked with `git status` that all your modifications are accounted for, you can use the `git commit`[command](https://git-scm.com/docs/git-commit). This will store all the changes in the history track of the current branch of your local repository. An identifier will be associated to your commit, as well as an entry in the log file.
Running `git commit` without any additionnal option will run a text editor and require you to enter a message explaining your commit. This can be avoided by using the `-m` option followed by a message (between double quotes)
The following screenshot shows the result of a commit on our pet project after the addition of some new information:
### Notes on the output of `git commit`
- The first line of the commit show the branch the changes were commited to (`main`) in this case, the commit identifier (`8de79b0`) and the message you entered.
- As this is the first commit, on a machine where we never used Git before, Git tries to guess how to set the author information (name and email address) for the commit. It also shows how to fix these if they are incorrect.
- The last lines of the commit show a summary of what has been actually committed.
