Squash commits into one with Git, Rebase
Steps:
1. Update branchegit reset --hard origin/features/BRANCHNAME
OR
git pull origin features/BRANCHNAME
Git
Install GitLab Community Edition
The official tutorial is hear : https://about.gitlab.com/installation/#debian?version=ce
CE or EE : https://about.gitlab.com/installation/ce-or-ee/?distro=debian
Completely reset GIT repository
Completely reset
Delete the .git directory locally.
Recreate the git repository:
$ cd (project-directory)
$ git init
$ (add some files)
$ git add .
$ git commit -m 'Initial commit'
SSH force usage of a specific key
To force usage of a specific key, put in your ~/.ssh/config file :
Host [HOST_NAME]
Hostname [HOST_NAME]
User [USER_NAME]
Port [PORT]
IdentityFile ~/.ssh/[your_private_key]
Git Usage 2 - Cherry-pick, Rebase
Cherry pick
Example:
Merge two git commits into one
This is an example to merge 2 last commits.
1. git rebase -i HEAD~2
2. Change pick to squash the commit you want to merge
3. Save and Exit
4. git push -f origin master
Git - Errors and problems
Cannot push Git to remote repository with http/https
return code 22 fatal: git-http-push failed
Git Tags - Git tag usage
Tag a branche / Version on git
git tag THE_TAG_NAME
Push tags or a tag to origin ripository
git push --tags
Show tags list
git tag
Git Tags
Add remove git tags.
Create a tag
git tag <TAGNAME>
Push tag
git push origin <TAGNAME>
git push --tags
Pull tags
git tag -l
git checkout tags/<TAGNAME>
Delete local tag
git tag -d <TAGNAME>
GIT , Remove all old changes and make Current as initial
This is the brute-force method. It also removes the configuration of the repository.
Step 1: remove all historyrm -rf .git