GIT let's talk about it

cherry-pick
https://www.youtube.com/watch?v=-ndmel-4wsk


git branching and merging
https://www.youtube.com/watch?v=uR-9NGrpU-c

Gitlab self-hosted

It's been a while that I have done trial and error installing Gitlab on my local machine and I find some interesting way of learning.

1st attempt
So first of all, I started to install Gitlab directly using someone's code base from github.

Looks promising, I will give it a try
https://gist.github.com/cjtallman/b526d8c7d8b910ba4fd41eb51cd5405b

I don't know what happen when I execute vagrant up but I was astonished

2nd attempt
This time, I read another tutorial with more details and videos
update: 2018-08-07
https://codereviewvideos.com/course/your-own-private-github

steps:
sudo apt-get update

sudo apt-get install -y curl openssh-server ca-certificates

sudo apt-get install -y postfix

wget --content-disposition https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/trusty/gitlab-ce_11.1.4-ce.0_amd64.deb/download.deb

sudo dpkg -i gitlab-ce_11.1.4-ce.0_amd64.deb
sudo gitlab-ctl reconfigure


3rd attempt
This time, is my favorite docker installation. hope everything's okay
Installation using Docker
https://hub.docker.com/r/gitlab/gitlab-ce/
https://docs.gitlab.com/omnibus/docker/

How to install GIT in centos

yum install git

Reference:
https://www.rosehosting.com/blog/how-to-install-git-on-centos-7/

GIT cheatsheet

I am curious about this GIT ever since but I don't have any actual encounter to use GIT in my development until now.  I have a freelance job which use GIT as source control.

This project is an odoo development.

I have been struggling to commit my codes as I'm not familiar how to use GIT but luckily I understand a little bit more now.
With the help of my friend Google. There are some tutorial and sites that is very helpful to my knowledge.

very slick site and clear to understand
http://rogerdudler.github.io/git-guide/

another very good site to understand more about merging
https://confluence.atlassian.com/bitbucket/use-a-git-branch-to-merge-a-file-681902555.html


# clone a remote repository
git clone https://skyguyver@bitbucket.org/skyguyver/malphi.git


# update local repository
git pull origin master


# to see any changes
git status

# to check the difference
git diff

# last 1 entry in the log
git log -1


# to move to staging
git add <file>

# to commit
git commit -m "some comments here"

# show commit history
git log


git show 81a00

# revert committed
git revert 81a00

# delete irreversible
# git reset --hard 2e75

# reset and delete current merge
git reset --hard HEAD

# set usename and email
$ git config --global user.name "John Doe"
$ git config --global user.email johndoe@example.com


I found this more useful with an image to understand more about GIT
https://developer.atlassian.com/blog/2014/12/pull-request-merge-strategies-the-great-debate/