Merge remote-tracking branch 'yousri/master'
merges yoursi changes to git tutorial.
This commit is contained in:
commit
fb23fbca2e
|
@ -0,0 +1,3 @@
|
||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
|
@ -0,0 +1,6 @@
|
||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<settings>
|
||||||
|
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||||
|
<version value="1.0" />
|
||||||
|
</settings>
|
||||||
|
</component>
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
|
||||||
|
</project>
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/python_course_doc.iml" filepath="$PROJECT_DIR$/.idea/python_course_doc.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="PYTHON_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$" />
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
<component name="PyDocumentationSettings">
|
||||||
|
<option name="format" value="PLAIN" />
|
||||||
|
<option name="myDocStringFormat" value="Plain" />
|
||||||
|
</component>
|
||||||
|
</module>
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
Binary file not shown.
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 97 KiB |
|
@ -1,19 +1,50 @@
|
||||||
# Git
|
# Git
|
||||||
|
|
||||||
|
Git is a Version Control System.
|
||||||
|
It is an advanced open source project.
|
||||||
|
That is the most popular VCS with his advantage like security, efficiency, speed etc.
|
||||||
|
He was developed in 2005 by Linus Torvalds, the Linux's father.
|
||||||
|
Many companies projects using Git (Google, Gnome, Netflix, etc).
|
||||||
|
In 2016 12 million people were using Git.
|
||||||
|
|
||||||
|
All project histories were saved in the work file.
|
||||||
|
You can publish, with all histories, projects in a Git platform like Gitea, GitHub, Bitbucket, GitLab, etc.
|
||||||
|
With this tool, you can commit projects, compare projects.
|
||||||
|
That is the best tool for teamwork.
|
||||||
|
|
||||||
## Git in Pycharm
|
## Git in Pycharm
|
||||||
|
|
||||||
### Starting a version controlled project
|
### Starting a version controlled project
|
||||||
|
|
||||||
|
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_00.png)
|
||||||
|
|
||||||
![screenhot](assets/git_pycharm_source_01.png)
|
![screenhot](assets/git_pycharm_source_01.png)
|
||||||
|
|
||||||
![screenhot](assets/git_pycharm_source_02.png)
|
![screenhot](assets/git_pycharm_source_02.png)
|
||||||
|
|
||||||
|
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)
|
![screenhot](assets/git_pycharm_source_03.png)
|
||||||
|
|
||||||
|
In the commit window, we can see file project.
|
||||||
|
But we had three important things.
|
||||||
|
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 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.
|
||||||
|
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)
|
||||||
|
|
||||||
![screenhot](assets/git_pycharm_source_06.png)
|
![screenhot](assets/git_pycharm_source_06.png)
|
||||||
|
|
Loading…
Reference in New Issue