Git

Sources : git-scm gitextensions.github.io (For UI) Using certificates with git

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Git is easy to learn and has a tiny footprint with lightning fast performance. It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like cheap local branching, convenient staging areas, and multiple workflows.

Installation:

• sudo yum install git git-gui

Git commands:

1. Have a local directory and willing to push it into git repository?

cd <LOCAL_DIR>

git init

git add -all

git commit -m 'Initial commit'

git remote add origin '<GIT_REPOSITORY_URL>'

git push origin master

git push

2. Have a git repository url, want to pull it down to local?

git clone '<GIT_REPOSITORY_URL>'

3. Push changes from local to repository.

git add --all

git commit -m "Message to indicate changes in current."

git push

4. Remove a file

git rm file

git commit -a -m "message"

git push

5. Create local branch from current.

Have changes in multiple files, need to commit selected to repo.

git status #Lists all changed files

git add <FILE1> <FILE2> <FILEn> #stages changes to commit

git remove <FILEn> #for deleted files

git commit -m "<BRANCH NAME> : <SHORT MESSAGE>" #commits staged changes

git push origin <BRANCH NAME> #Pushes commit branch to origin(repo).

Git Server, why bitbucket or gitbucket?

why : Git requires network and user level configurations which sometimes is hectic, hence for ease of use and security reasons bitbucket, github, etc are available. These also removes need of hardware and its maintenance burden.

Yet, How to setup git server in my local infra: Source: git-scm.com

We will need list of users and their id_rsa.pub file. Assumed we have 2 developer and a server node in our network.

we want to host git repo(git-repo1.git) on server 'S' and user 'A' on Node 'N1' and user 'B' on Node 'N2' will be using this repo. ssh-keygen -t rsa can be used to generate user's id_rsa.pub files on each user's node.

Steps: On S node:

• sudo useradd git #To Create a git user on server.
• su git #switch to git user
• cat A/id_rsa.pub B/id_rsa.pub >> ~/.ssh/authorized_keys # A@N1 & B@N2 are now allowed on S
• mkdir -p /data/git-repo1.git #This is location where files committed will be stored
• cd /data/git-repo.git
• git init -bare #This initializes the repository repo "git@gitserver:/data/git-repo.git" is ready for use.

Steps: On N1&2 Node:

• git clone git@gitserver:/data/git-repo.git # this will clone empty repository to current path on current node. user can create a branch and add contents in cloned folder finally commit these to origin.
• OR, Preform git initialization within ready-folder to be sent in repository and commit contents to local. finally adding folder to repo as follows.
• cd <PROJECT_FOLDER>
• git init
• git add .
• git commit -m "master: Initial commit" #This may require user.name configuration. use
  • git config --global user.name "<ANY NAME>" #This will be used as label shown to other users about commit.
  • git config --global user.email "<ANY EMAIL>" #--global will create .gitconfig file in user's home directory. Else .gitconfig is created within current-folder/.git/config/
• git remote add origin git@gitserver:/data/git-repo.git
• git push origin master

Resolve conflicts:

• source github

Problems & Solutions:

#Git Fails to clone a repository due to network security. (Certificates required.)

Use http.sslCAInfo param :

• git config --global http.sslCAInfo <CERTIFICATE_FILE_PATH>
• git clone <REPOSITORY>

#Git bash completion not working in centos 7

• need to invoke /etc/bash_completion.d/git using source or put it in bashrc for default .