Basic Git commands

1. Cloning a git branch

git clone -b solution https://github.com/SNCodingChallenge/stm_challenge_krishna_paudel.git

2. Change push repository

   First clone the git project into your local:
   git clone [email protected]:/opt/git/MyProject.git
 
 Go into MyProject folder and hen remove the .git folder which clears out all the old information. Run the command:

git init 

Which regenerates git information. Now we add remote repository to push:

  git remote add [email protected]:/repos/git/MyNewProject.git 

Now verify:

  git remote -v 

3. Create a new repository in the server

 Create a folder MyNewProject.git into Server repository.
 Go into the directory and execute

   git init –bare

Give access rights to the git user. (Normally we set the owner of the directory as git)

4. Push to the remote repository

git push origin master

5. Commit changes to the local repository

git commit -m “Message”.

6. Merge updates from a branch

git pull [origin branch]

Example:
a) Merging from the same branch
git pull

b) Merging from master branch
git pull origin master

Note: If sometimes, the pull merging gives the following failure:
“refusing to merge unrelated histories”
Then the following command will be useful.

git pull origin master –allow-unrelated-histories

7. Disable http ssl verification

We need this when we create a certificate by ourselves for our private purposes. In that situation, we have to disable SSL verification or simply use ssh. 

git config –global http.sslverify “false”

8. Store GIT credentials

It stores the credential and you never need to provide the username and password.

 

There are some options too:

If we display the branch name in the terminal, it helps us to know which branch we are working on and also prevents mistakenly working on other unintended branches.

 

I found the script to run to activate this feature in the terminal. 

 

# Show git branch name
force_color_prompt=yes
color_prompt=yes
parse_git_branch() {
 git branch 2> /dev/null | sed -e ‘/^[^*]/d’ -e ‘s/* (.*)/(1)/’
}
if [ “$color_prompt” = yes ]; then
 PS1=’${debian_chroot:+($debian_chroot)}[33[01;32m]u@h[33[00m]:[33[01;34m]w[33[01;31m]$(parse_git_branch)[33[00m]$ ‘
else
 PS1=’${debian_chroot:+($debian_chroot)}u@h:w$(parse_git_branch)$ ‘
fi
unset color_prompt force_color_prompt

 

When we have implemented a single feature, that consists of multiple commits, we can squash the commits and provide a sensible commit message before merging into the branch. This way of squashing will provide you clear history in the branch. 

 

First, we get the last n commits, where we can squash or pick the comments. 

git rebase -i HEAD~2

git push -f origin [branch]

git rebase --abort

git pull origin [branch] == git fetch & git merge origin [branch]

git rebase origin [branch] == git pull --rebase origin [branch]

git rebase --continue

git rebase --abort