Compare commits

...

2 Commits

1 changed files with 28 additions and 28 deletions

View File

@ -164,20 +164,20 @@ waldek@metal:~/Documents/my_first_git_repository$
In Pycharm, you have to enable a version control integration. In Pycharm, you have to enable a version control integration.
There are many choices, but we will use Git. There are many choices, but we will use Git.
![screenhot](assets/git_pycharm_source_00.png) ![screenhot](./assets/git_pycharm_source_00.png)
![screenhot](assets/git_pycharm_source_01.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. 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. And you can identify the current branch that you are in.
So the default branch name is **master**. So the default branch name is **master**.
![screenhot](assets/git_pycharm_source_02.png) ![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. And add all contents that we write in a git repository.
![screenhot](assets/git_pycharm_source_03.png) ![screenhot](./assets/git_pycharm_source_03.png)
In the commit window, we can see which file had changed. In the commit window, we can see which file had changed.
But we had three important things too. But we had three important things too.
@ -186,45 +186,45 @@ In the textBox, you can write a comment when you commit.
The _Commit_ button is used to save all change of your project in a git repository. 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. The _Commit and Push_ is used to commit and push the project in a Git.
![screenhot](assets/git_pycharm_source_04.png) ![screenhot](./assets/git_pycharm_source_04.png)
When you press the _Commit and Push_, a new window appears. When you press the _Commit and Push_, a new window appears.
You can see which branch and which commit that you push. You can see which branch and which commit that you push.
![screenhot](assets/git_pycharm_source_05.png) ![screenhot](./assets/git_pycharm_source_05.png)
## Creating an online repository ## Creating an online repository
If you use Gitea and you want to create a new 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**. That is pretty simple, you have to press the button **New Repository**.
![screenhot](assets/git_pycharm_source_06.png) ![screenhot](./assets/git_pycharm_source_06.png)
And then, you can add the repository name, and others parameters like description, the visibility, etc. And then, you can add the repository name, and others parameters like description, the visibility, etc.
![screenhot](assets/git_pycharm_source_07.png) ![screenhot](./assets/git_pycharm_source_07.png)
When you have finish, you have to press the button **Create Repository**. When you have finish, you have to press the button **Create Repository**.
![screenhot](assets/git_pycharm_source_08.png) ![screenhot](./assets/git_pycharm_source_08.png)
Et voila, you have created a new repository on Gitea and you receive an https link. 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. 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) ![screenhot](./assets/git_pycharm_source_09.png)
If you want to work in your repository in Pycharm, you have to clone it. 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**. 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. 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) ![screenhot](./assets/git_pycharm_source_10.png)
When the clone is successfully does, you can change the project. When the clone is successfully does, you can change the project.
And if you have finished your job, you can **Commit and Push**. 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. 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**. And then, you can press **Commit and Push**.
![screenhot](assets/git_pycharm_source_11.png) ![screenhot](./assets/git_pycharm_source_11.png)
In the bottom git window, you can see all commits, and their comments, of this repository. 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. If you clone a another repository, you will be able to see all commits that people made and their comment.
@ -234,20 +234,20 @@ That is pretty cool !
In Gitea, you can see what the git repository contain and the last comment of commits. In Gitea, you can see what the git repository contain and the last comment of commits.
![screenhot](assets/git_pycharm_source_12.png) ![screenhot](./assets/git_pycharm_source_12.png)
If you check all changes and you want to **Commit and Push**, don't forget the comment. If you check all changes and you want to **Commit and Push**, don't forget the comment.
That is important for a good teamwork. That is important for a good teamwork.
![screenhot](assets/git_pycharm_source_13.png) ![screenhot](./assets/git_pycharm_source_13.png)
If you commit twice, you are able to verify how many commits and when commits have done. If you commit twice, you are able to verify how many commits and when commits have done.
![screenhot](assets/git_pycharm_source_14.png) ![screenhot](./assets/git_pycharm_source_14.png)
<!--- <!---
![screenhot](assets/git_pycharm_source_15.png) ![screenhot](./assets/git_pycharm_source_15.png)
--> -->
@ -257,36 +257,36 @@ If you click in it, you have just copy and paste the https link of the git repos
To arrive at the *startup screen* shown below you need to close all open projects. To arrive at the *startup screen* shown below you need to close all open projects.
![screenhot](assets/git_pycharm_clone_00.png) ![screenhot](./assets/git_pycharm_clone_00.png)
You have to trust the git repository. You have to trust the git repository.
![screenhot](assets/git_pycharm_clone_01.png) ![screenhot](./assets/git_pycharm_clone_01.png)
And then, you can go to settings and choice your **Python interpreter**. And then, you can go to settings and choice your **Python interpreter**.
If you don't have one, you can add one. If you don't have one, you can add one.
![screenhot](assets/git_pycharm_clone_02.png) ![screenhot](./assets/git_pycharm_clone_02.png)
![screenhot](assets/git_pycharm_clone_03.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. 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) ![screenhot](./assets/git_pycharm_clone_04.png)
Now, we have a new window where you can push yours commits. Now, we have a new window where you can push yours commits.
![screenhot](assets/git_pycharm_clone_05.png) ![screenhot](./assets/git_pycharm_clone_05.png)
And if you push it, you have to login to Gitea. And if you push it, you have to login to Gitea.
![screenhot](assets/git_pycharm_clone_06.png) ![screenhot](./assets/git_pycharm_clone_06.png)
<!--- <!---
![screenhot](assets/git_pycharm_source_16.png) ![screenhot](./assets/git_pycharm_source_16.png)
![screenhot](assets/git_pycharm_source_17.png) ![screenhot](./assets/git_pycharm_source_17.png)
--> -->
@ -295,12 +295,12 @@ And if you push it, you have to login to Gitea.
If someone adds something to your git repository, and you want to refresh your git repository. 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**. You can tap to Git in the toolbar and then press **Pull**.
![screenhot](assets/git_pycharm_source_18.png) ![screenhot](./assets/git_pycharm_source_18.png)
A window will appear to ask you which repository do you want to pull. A window will appear to ask you which repository do you want to pull.
![screenhot](assets/git_pycharm_source_19.png) ![screenhot](./assets/git_pycharm_source_19.png)
Et voila, your git repository is refreshed. Et voila, your git repository is refreshed.
![screenhot](assets/git_pycharm_source_20.png) ![screenhot](./assets/git_pycharm_source_20.png)