Git is a tool to manage a project, wich can be collaborative. Yous commit repositories of your modifications.
Install and configure git
To install git on Linux mint 18.3, open a terminal and type :
sudo apt-get install git-all
To configure global datas of your projects, use git config like
git config --global user.name "student_name"
git config --global user.email "student_email"
git config --global core.editor your_text_editor
Create a project
To create a project, drive in your directories, make a project directory and create a git project:
cd ~/Documents
mkdir my_project
cd my_project
git init
Or you can contribute to an existing project using http porotocol :
git clone https://gitlab.fabcloud.org/academany/fabacademy/2018/labs/student_lab/students/student_name.git
or use SSH. Then, you have first to create a ssh key with, on linux :
ssh-keygen -t rsa -C "student_email" -b 4096
Then goto https://gitlab.fabcloud.org/academany/fabacademy/2018/labs/student_lab/students/student_name
Sign in
In your Profile, choose SSH Keys menu.
Then copy file content of ~/.ssh/id_rsa.pub in Key frame and click Add key
After, you can import a git repository with :
git clone git@gitlab.fabcloud.org:academany/fabacademy/2018/labs/student_lab/students/student_name.git
Add files
To add files in your project :
git add README
git add *.html
git add *
git commit -m 'initial project version'
You can also remove files with:
git rm --cached file_to_remove
and move files with:
git mv file_from file_to
Status and commit
After works on your project, you can know wich files have been added, modified by typing :
git status
git status --short
When necessary, You can record modifications with :
git commit -m 'new version'
If you need to ignore some files, you can create a .gitignore file with list of files to ignore like:
my_tmp_file
*.pyc
All changes can be seen in the history with:
git log
See modifications
To see what have been modified since last commit, type :
git diff file
To checkout modifications, type :
git checkout -- file
Push modifications
To send modifications to your web clone (origin server), type:
git push origin master
Branch
To test modifications on your project, you can make a temporary branch and merge it with your project when validated.
You can view all branches with :
git branch
result is something like:
* master
other_branch
Branch you are working on is marked with *
You can create a new branch with :
git branch branch_name
Change branch with :
git checkout branch_name
To merge modification to master :
git checkout master
git merge branch_name
Remove the branch with :
git branch -d branch_name
and to discard modifications
git branch -D branch_name
