Merge remote branch 'yousri/master'

learning_git.md

@@ -17,6 +17,9 @@ That is the best tool for teamwork.
 # Git via `bash`
 
 ## Initialing a git repo
+To initialize an empty git repository, you can tap _**git init**_ in a text editor like Git Bash. 
+This command will create a git repository in the initial branch **master**.
+You will be able to add, commit, push, etc. 
 
 ```
 waldek@metal:~/Documents/my_first_git_repository$ git status
@@ -41,8 +44,12 @@ No commits yet
 nothing to commit (create/copy files and use "git add" 
 ```
 
+If you want to see if you are in a git repository, you can use _**git status**_.
+He will inform you which branch that you are and how many commits in this repository.
+Be careful with commands because you have to be in a folder.
+In the preceding example, the new repository was in the "my_first_git_repository" folder.
 ## What's in this repo
-
+You can see all files of your git repository with the command **_ls_**.
 ```
 waldek@metal:~/Documents/my_first_git_repository$ ls -la
 total 12
@@ -156,26 +163,27 @@ waldek@metal:~/Documents/my_first_git_repository$
 
 In Pycharm, you have to enable a version control integration. 
 There are many choices, but we will use Git.
-As you can see, Git appears in the toolbar and a git window appear bottom of the window.
-And you can identify the current branch that you are in.
-So the default branch name is **master**.
 
 ![screenhot](assets/git_pycharm_source_00.png)
 
 ![screenhot](assets/git_pycharm_source_01.png)
 
+As you can see, Git appears in the toolbar and a git window appear bottom of the window.
+And you can identify the current branch that you are in.
+So the default branch name is **master**.
+
 ![screenhot](assets/git_pycharm_source_02.png)
 
-Let's try to write some code 
+Let's try to write some code.
 And add all contents that we write in a git repository.
 
 ![screenhot](assets/git_pycharm_source_03.png)
 
-In the commit window, we can see file project. 
-But we had three important things.
+In the commit window, we can see which file had changed. 
+But we had three important things too.
 We have a textBox and two buttons.
 In the textBox, you can write a comment when you commit.
-The _Commit_ button is used to save all change in your project.
+The _Commit_ button is used to save all change of your project in a git repository.
 The _Commit and Push_ is used to commit and push the project in a Git.
 
 ![screenhot](assets/git_pycharm_source_04.png)
@@ -187,24 +195,54 @@ You can see which branch and which commit that you push.
 
 ## Creating an online repository
 
+If you use Gitea and you want to create a new repository. 
+That is pretty simple, you have to press the button **New Repository**.
+
 ![screenhot](assets/git_pycharm_source_06.png)
 
+And then, you can add the repository name, and others parameters like description, the visibility, etc.
+
 ![screenhot](assets/git_pycharm_source_07.png)
 
+When you have finish, you have to press the button **Create Repository**.
+
 ![screenhot](assets/git_pycharm_source_08.png)
 
+Et voila, you have created a new repository on Gitea and you receive an https link.
+This link is used if you want to share your project with someone, or you want to clone this repository.
+
 ![screenhot](assets/git_pycharm_source_09.png)
 
+If you want to work in your repository in Pycharm, you have to clone it.
+In the toolbar, you can click on Git and you will find the button **Clone**.
+Then, a window will be open, and you have to copy and paste the https link of your repository.
+
 ![screenhot](assets/git_pycharm_source_10.png)
 
+When the clone is successfully does, you can change the project.
+And if you have finished your job, you can **Commit and Push**. 
+If you want to commit and push all changes that you have made, you have to check all changes in the left window.
+And then, you can press **Commit and Push**.
+
 ![screenhot](assets/git_pycharm_source_11.png)
 
+In the bottom git window, you can see all commits, and their comments, of this repository. 
+If you clone a another repository, you will be able to see all commits that people made and their comment.
+That is pretty cool !
+
 ## Adding some changes to our local code
 
+In Gitea, you can see what the git repository contain and the last comment of commits.
+
 ![screenhot](assets/git_pycharm_source_12.png)
 
+If you check all changes and you want to **Commit and Push**, don't forget the comment. 
+That is important for a good teamwork.
+
 ![screenhot](assets/git_pycharm_source_13.png)
 
+If you commit twice, you are able to verify how many commits and when commits have done.
+
 ![screenhot](assets/git_pycharm_source_14.png)
 
 <!---
@@ -214,21 +252,34 @@ You can see which branch and which commit that you push.
 -->
 
 ## Cloning the remote project into a new project
+In the main menu of PyCharm, you can click in **Get from VCS**.
+If you click in it, you have just copy and paste the https link of the git repository.
 
 To arrive at the *startup screen* shown below you need to close all open projects.
 
 ![screenhot](assets/git_pycharm_clone_00.png)
 
+You have to trust the git repository.
+
 ![screenhot](assets/git_pycharm_clone_01.png)
 
+And then, you can go to settings and choice your **Python interpreter**.
+If you don't have one, you can add one.
+
 ![screenhot](assets/git_pycharm_clone_02.png)
 
 ![screenhot](assets/git_pycharm_clone_03.png)
 
+If you want to push your local repository, you have to identify with your name and your e-mail.
+
 ![screenhot](assets/git_pycharm_clone_04.png)
 
+Now, we have a new window where you can push yours commits.
+
 ![screenhot](assets/git_pycharm_clone_05.png)
 
+And if you push it, you have to login to Gitea.
+
 ![screenhot](assets/git_pycharm_clone_06.png)
 
 <!---
@@ -241,8 +292,15 @@ To arrive at the *startup screen* shown below you need to close all open project
 
 ## Updating the original project
 
+If someone adds something to your git repository, and you want to refresh your git repository.
+You can tap to Git in the toolbar and then press **Pull**.
+
 ![screenhot](assets/git_pycharm_source_18.png)
 
+A window will appear to ask you which repository do you want to pull.
+
 ![screenhot](assets/git_pycharm_source_19.png)
 
+Et voila, your git repository is refreshed.
+
 ![screenhot](assets/git_pycharm_source_20.png)