Git Clone and Push Using SSH with Passphrase

Open console and type

$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/user_name/.ssh/id_rsa):<return>
Enter passphrase (empty for no passphrase):<type passphrase>
Enter same passphrase again:<type passphrase>
Your identification has been saved in /c/Users/user_name/.ssh/id_rsa.
Your public key has been saved in /c/Users/user_name/.ssh/id_rsa.pub.
The key fingerprint is:
**:**:**:**:**:** user_name@COMPUTERNAME

Your public key is at c:/Users/user_name/.ssh in file id_rsa.pub. Add the public key to your bitbucket account.

$ git clone git@bitbucket.org:folder_name/project_name.git
Cloning into project_name...
The authenticity of host 'bitbucket.org (131.103.20.167)' can't be established.
RSA key fingerprint is **:**:**:**:**:**.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'bitbucket.org,131.103.20.167' (RSA) to the list of known hosts.
Enter passphrase for key '/c/Users/user_name/.ssh/id_rsa':
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (3/3), done.

$ cd project_name/

modify/create/add files

$ git add .

$ git commit -m "message"
[master d72b82a] modified readme file again
 1 files changed, 1 insertions(+), 1 deletions(-)

$ git push -u origin master
Enter passphrase for key '/c/Users/user_name/.ssh/id_rsa':<type passphrase>
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 300 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@bitbucket.org:folder_name/project_name.git
   cf17705..d72b82a  master -> master
Branch master set up to track remote branch master from origin.

This is how you communicate wit SSH enabled git repo.

Git Workflow for Local and Remote Repository

Typical workflow for two developer that clone/fetch/push to a remote git repo. Each developer use one tracking branch. Once changes are pushed to remote repo we use rebase twice to merge the local branches into the master branch.

Git resolving conflict on remote machine

Git conflict resolution on remote server after two branches merging into master branch
Branches are master, armand and ralph.

Git protocol on server and client side

This is an advanced tutorial for experienced users that are familiar with git, SSH protocols and shell scripts.
 
On server side

[user@test_server ~]$ git daemon --base-path=/var/www/html --reuseaddr  --export-all --verbose --enable=receive-pack 

Do not close the terminal on server.

 --base-path=/var/www/html is path to your repository.

Git most used features

Cache credentials if you need to enter credentials only once and they are cached for 900 seconds

git config credential.helper 'cache --timeout=3000'

Create branch from an existing branch and switch to it

git checkout -b new_branch develop

Create branch from commit and switch to it

git checkout -b new_branch d9410d98f69d08

Diff between local and remote branch

git fetch
git difftool origin/develop develop
# to refresh develop branch
git pull

Delete branches that don't exist on remote repo - sync remote and local repo

# git remote prune origin
* [pruned] origin/branch_name
# git branch -d branch_name # manually remove orphan

comparing files in two revisions

# this will launch diff tool for one file in two revisions
$ git difftool 344c f8cc proba.txt

# this will launch diff tool for one file in commit and working directory
$ git difftool  a9a5f2a ./component.ts

# Usage of difftool for comparing all files in two revisions
git difftool 8c6a dd6b

Compare current commit with previous one

git difftool HEAD..HEAD~1

Put in zip archive files from single commit

git archive -o latest.zip HEAD

My favorite format for log

git log --pretty=format:"%C(#cd9a00)%h %C(#0080ff) <%an> %C(#17b062)(%cr) %d %C(#c0d6de)%s"

remove ajax.php from version control but not from file system

git rm --cached ajax.php 
git commit -m 'removed ajax.php from git'

put file from past commit to index and view diff.

git checkout 42cf1ad -- package.json
git difftool --cached

Search every branch in Git Repository and find commit containing messageb or regex search fin.*me in specified time range and print hash, line number and lines around matching line.

# in PowerShell and Linux
git grep -in -C 1 messageb $(git rev-list --all)
git grep -in -C 1  fin.*me $(git rev-list --all --since="2021-05-10" --before="2021-05-26")

another useful when looking for source code in all branches

# search in all files in all branches
# only Linux
git rev-list --all | (
    while read revision; do
        git grep -F 'yourWord' $revision
    done
)

to find branch with SHA

$ git branch -a --contains 08d70aa131ded0ca84f9d31b7
newmain

search all commit messages in all branches

git log --all --oneline | grep "yourWord"

How single file changed in past by time and between commits

git log --follow -p  --since="2 hours ago"  -- README.md
git log --follow -p  HEAD~3..HEAD -- README.md

List commits for my_branch since it's creation

git log --pretty=format:"%C(#cd9a00)%h %C(#0080ff) <%an> %C(#17b062)(%cr) %d %C(#c0d6de)%s" master..my_branch

Solve conflict, merge and refresh feature branch from master

git checkout -b my-branch # create new branch from master
# modify line, commit & push
# in GitLab modify same line add commit on master 
# create merge request, try to merge it - it fails
git checkout master
git pull # refresh local copy
git checkout my-branch
git merge master
# merge, commit & push
# merge my-branch into master in GitLab using merge request

Install diff and merge tool for Windows: 1.Install KDiff3 2.Place this in .gitconfig file

[difftool "kdiff3"]
    path = "c:/Program Files/KDiff3/kdiff3.exe"
    trustExitCode = false
[difftool]
    prompt = false
[diff]
    tool = kdiff3
[mergetool "kdiff3"]
    path = "c:/Program Files/KDiff3/kdiff3.exe"
    trustExitCode = false
[mergetool]
    keepBackup = false
[merge]
    tool = kdiff3