git merge

 

Git cherry-pick:
----------------
Cherry pick used to choose a particular commit from one branch and apply it onto another.

syntax:
$ git cherry-pick <commitID>

--------------------------------------------

Git Reset:
----------
git reset command is used to go to previous version of code
git reset --hard <commitID>

--------------------------------------------------------------

Git Reset
-----------
Git reset is used to undo the commited changes, but commit history will also gets removed

Two important types of git reset are there

1) soft reset:
soft reset is used to move files from local repo to staging area
+ commit history will also gets removed

syntax: git reset --soft <commit_ID>

2) Hard reset:
hard reset will remove file from everywhere ( local repo , staging area & working directory )
+ commit history will also gets removed

syntax: git reset --hard <commit_ID>

Git revert
----------
Git revert is also used to undo the commited changes, but commit history will not get removed,
we can track the reverted changes in the git log

syntax:
git revert HEAD

Note:

git revert is used to rollback only ( go 1 step back- previous version of code)

+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Difference between Git Reset & Git Revert:
---------------------------------------------

both reset & revert are used to undo the commited changes

Git reset:
1. if we use git reset commit history will get removed / deleted
2. Reset is destructive, as it will delete that commit & we cannot see the old commit

Git revert:
1. if we use git revert commit history will not get removed / deleted
2. Revert is Non Desrtuctive, as it will create new commit each time.

Git Reset logs:
===============

mkdir project6
cd project6

git init

touch file1 file2
git add .
git commit -m "first commit adding file1 file2 "

touch file3 file4
git add .
git commit -m "second commit adding file3 file4 "

git log --oneline
git status ==> (nothing to commit, working tree clean )

git reset --soft <first_commitID>

git log --oneline ==> ( you will only see first commit second commit got deleted from git log )

git status ==> ( file3 & file4 will in staging area )

---------------
git hard reset
-----------------
git commit -m "second commit adding file3 file4 "
git log --oneline
git status ==> (nothing to commit, working tree clean )

git reset --hard <first_commitID>

git log --oneline ==> ( you will only see first commit and second commit got deleted from git log )

git status ==> ( file3 & file4 deleted from everyehere )

+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

git revert logs:
==================

mkdir project7
cd project7

git init

touch file1 file2
git add .
git commit -m "first commit........"

touch file3 file4
git add .
git commit -m "second commit........"

git log --oneline

git revert HEAD ## file3 file4 are deleted due to revert /rollback to last version

*****************************************************************************************************************

WORKING WITH REMOTE REPOSITORIES:
=================================

Repository
----------
repository ==> folder / location ==> where you can store your files

Local Repository
----------------
repository which is there in your laptop/server

Remote repository
-----------------
centralized location where all source code related to project will be kept

remote repo service providers are ==> GitHub( https://github.com) , BitBucket , Gitlab

===============================================================================

Note:
------
Remote repo === central repo ==> same

Public repo ==> visble to everyone ==> you can clone / download my project
Private repo ==> visible to us & we can add anyone who needs access ==> companies

if we create repo ==> Gitbash ==> default branch is master
if we create repo ==> Github ==> default branch is main

To rename branch: git branch -m <old_branch_name> <new_branch_name>
----------------------------------------------------------------------------
================================================================================

 

jenkins