All Git Command and use
all git command
- git config core.fileMode false
it remove from git status & when create the PR it will not affect (as per your file use - git update-index --assume-unchanged )
-----------------------------------------------------------------
- git update-index --assume-unchanged app/etc/config.php
- git update-index --no-assume-unchanged app/etc/config.php
-
git init: for linking your folder with an empty repository.
git init -
git clone: for using the exiting repository and working on it.
syntax: git clone <repo-name> <directory> Example: git clone https://github.com/sanjay-codez/Git-Command.git app -
git config: for configuring the git info such as user name , email and all.
Example: git config –global user.name “sanjay-codez” git config –global user.email “sanjay.d@gmail.com” -
git add: for adding the files to git
syntax: git add <file> Example: git add code/Codilar/Merchant -
git commit: In Simple words git commit is like a storing of code in a separate space where all the things you commit are tracked.
syntax: git commit -m "Message" git commit --amend -m "Change the Message" Example: git commit -m "[feature/merchant] Merchant Module Added" -
git branch: This command lists all the local branches in the current repository.
syntax: git branch #shows list of branch present git branch -D <branch-name> #deletes the branch -
git checkout: This command is to switch and create the branches
syntax: git checkout <branch-name> #switch to the existing branch git checkout-b <new-branch-name> #switch to new branch by creating it. git checkout <file-name> #removes the modified content or file. git checkout-b <new-branch-name> <reference-branch> (Switch to a new branch by keeping the reference). Example: git checkout -b feature/merchant development
Note: Why do we require branch model?
Lets assume you are writing a code, for a feature called mobile login, initially the requirement would be for mobile login for all the country. you wrote code by considering all the country code, you may have finished 80% of work, later client says we are just releasing this phase in India so lets finish it fast only do it for India. So you have to remove 40% code and make changes, tomorrow the client says they decided to release in all the country so they require the feature, so you would have to rework and build it.
Instead of doing this if you create a new branch(feature/merchant-v1.0) from the feature/merchant, then tomorrow you can pull from the existing and continue the work.
Branch Model
-
git diff: This command is to check the difference between the current code and previous commit.
syntax: git diff #when you want to check diff across all the files. git diff <file-name> #when you want to check difference in a specific file Example: git diff git diff code/Codilar/merchant/etc/frontend/di.xml -
git push: This command is to push the commit to your respective branch
syntax: git push origin <branch-name> #when you have to push the origin repository git push <remote-name> <new-branch-name> #when you to push to a remote repository.). Example: git push origin feature/merchant
Note: Some other important commands such as git reset, git stash, git rebase are used when we add a file to git by mistake and we want to fix it or revert it.
- git pull
- git pull on the other hand does that AND brings (copy) those changes from the remote repository.
- git fetch
- git fetch is the command that tells your local git to retrieve the latest meta-data info from the original
(yet doesn’t do any file transferring. It’s more like just checking to see if there are any changes available).
- git merge
List the all remote branch
- git remote -v
- git branch -r
- git fetch origin
This fetches all the remote branches from the repository.
origin is the remote name you're targetting. So if you had an upstream remote name, you can call
- git fetch upstream
- git fetch --all
Change the Branch
- git checkout -f origin/development
Reset The Git
- sudo git reset --hard origin/development
- git rebase development
- git stash
-
1- When Trying to checkout for one branch to another branch some error will be there
|
|--------- git checkout file (all the file that modified on current branch)
|--------- rm -rf file (if that file is not required for current branch)
2- When some code not require on a branch and need to delete from branch(also code which present in branch and that branch already merged)
|
|
|-----rm -rf folder(code/file)
|-----git add folder(code/file)(delete file )
|-----git comiit -m "file delete"
Error: Your local changes to the following files would be overwritten by checkout:
- git checkout -f development(You Branch Name)
-
Support for password authentication was removed on August 13, 2021. Please use a personal access token instead.
Create Personal Access Token on GitHub
Link - https://stackoverflow.com/questions/68775869/support-for-password-authentication-was-removed-please-use-a-personal-access-to
From your GitHub account, go to Settings =>
Developer Settings =>
Personal Access Token =>
Generate New Token (Give your password) =>
Fillup the form =>
click Generate token =>
Copy the generated Token, it will be something like ghp_sFhFsSHhTzMDreGRLjmks4Tzuzgthdvfsrta
First taking the git Clone
- git clone git@git.corp.adobe.com:acs-gdc-adobe-commerce-services/lgkorea-google-tag.git GoogleTag
Going to that directory
- cd GoogleTag
- ls (code which is coming from master branch)
Creating new Branch
- git checkout -b GoogleTag - here i am creating new branch bcz i need to put my code
After checkout also i will get this master branch file inside my Custom branch
- sudo rm -rf Block/ etc/ registration.php Setup/ view/ -- so i am deleting from my custom created branch
After Delete Check the Files
- git status --- deleted file details we will get here
Adding this deleted details file
- git add .
After adding the deleted file details Commiting the files
- git commit -m "old deleted files "
Pushing the Deleted Codes
- git push origin GoogleTag
-------------------Now Go to the Git Repo and Check the Details and Changes-----------------------------
This is the File Which i need to Keep to Our New Custom Branch Location
- sudo cp -r /home/codilar/Documents/Adobe/GoogleTag
Go to That File Location where we need paste
- sudo cp -r /home/codilar/Documents/Adobe/GoogleTag/* ./
------------------------------Now check the files - for all the changs files -----------------------------------
- git status
- git add .
- git commit -m "module refactoring"
- git push origin GoogleTag
- At the time of Connect to Putty
|---when we took the pull from git and when we try to get this remote file into local
|
|---At that time we will get the some modified code error
|
(Root User or Local User) -- So we get everytime modified file error
You should be able to change the permissions (by terminal on the machine or over SSH) by running this so that users other than root can access it:
- sudo chmod -R 757 /var/www
(or) this so that it is owned by your user (which should be defined by $USER):
- sudo chown -R $USER:$USER /var/www
- sudo git config core.fileMode false
You need to do this as only the owner+group can read, write and execute in /var/www, but other users can only read and execute - including the user you are using to try and the folders.
For more info, look at man chmod and man chown
ssh: Could not resolve hostname github.com: Temporary failure in name resolution fatal: Could not read from remote repository.
Resolve - Restart the Ssh - Dis-connect the VPN Connection and Re-Connect with the WinSCP -->(Basically need to Disconnect the VPN and Give Permission (chmod -R 777 /var/www/html/)
-> If Getting Conflict on branch
|
|-> take the pull from that conflict branch and remove the conflict code
--> sudo git config --global --add safe.directory '*'
--> sudo git config core.fileMode false
- ssh -T GITHUB-User_Name(Sanjay-cod34082)@github.com ---> Check the git connection is success or not through ssh
- ssh-keygen -t rsa -b 4096 -C "cod34082@adobe.com" ---> If ssh key is not generated use this to generated pub and private key
- If Accidentaly we did git checkout
|-----------------for vs code do -- ctrl+Z to back the changes
|-----------------for vs code - check on local history
Info
1) Parent Repository = https://gitlab.codilar.in/codilar-internal/resource-booking-and-hiring.git
|
|
2) (Fork the Parent Repository)
|----------if fork have some issues(not showing target(parent repo) branch when raising PR) also you are not able create 2nd time new fork from parent branch(some error)
|
|
In Gitlab there is a section called Groups (you will show in nav bar)
|
|
Create new Group (Group Name -eg "Sanjay Kumar")
3)Now go to Parent Branch and Click on fork
|
|
It will show you the Group name that you created (Select that group)
4) now you have new fork from parent branch with new Group name
5) if you want latest code from parent branch
|-------git remote -v
|-------git remote add upstream ("https://gitlab.codilar.in/codilar-internal/resource-booking-and-hiring.git")
|-------git remote -v
|-------git fetch upstream
|-------git checkout -b develop (create new branch for fork repo)
|-------git pull upstream develop(or) (git pull upstream master)(from which parent branch you want latest code)
6) Add you code and Push to Parent repo from you Fork repo
|
|------git checkout -b edit_history(branch name for new my code changes)
|
|----- develop your functionality
|
|------git status
|------git add "files"
|------git commit -m "comments"
|------git push origin edit_history
|
|------ Open the PR link and select your Target Branch (which parent branch you want to create PR request)
Info
- git stash
- git stash pop
- git revert
- git cherry-pick commit-id
Info
- Production Branch - production-5.0
- Staging Branch - staging-6.0
- Developer -1
- task/branch-1
- task/branch-2
- task/branch-3
- Here Developer create branch from production-5.0 and created PR to production-5.0 so if need to merge the same code to staging-6.0
then you need to be on staging-6.0 branch and do git cherry-pick the PR by commit id
production-5.0
|
|---------------- task/branch-1 (created branch from production-5.0)
|
|---------------- created the PR to --- production-5.0 - let's say commit id = fsd3sfs23423
|
|---------------- if you want this PR code need to be merge into staging then follow below steps
checkout to - staging-6.0
|
|-------- git pull origin staging-6.0
|
|-------- git cherry-pick fsd3sfs23423 (commit id of the PR which is raised to staging-6.0)
|
|
|------- check if any conflict found then resolve it
|
|------- git status
|
|------- git add respected files
|
|------- git commit -m "comment "
|
|------- git push origin staging-6.0
|
|------- now code is already pushed to staging-6.0 branch run the deployment command
|
|------- one thing you can notice here - that PR you created for production-5.0 will be still on open status because once it is merged to production-5.0 then status will change to merged
- Developer -2
- task/branch-1
- task/branch-2
- task/branch-3
Info
let's see i created branch from production
my branch i.e- test-task
let's see -----> i create the PR from test-task to production
- now this PR is not merged from long time now we are getting the - Merge Block
So to resolve this issue(merge block issue) need to follow below steps
- sudo git checkout production
- sudo git pull origin production
- sudo git checkout test-task
- sudo git pull --rebase origin production-5.0-with-mobile-api
- here we will able to see the conflicts so need to resolve the conflicts
- if some issue then abort the rebase ----> git rebase --abort
- now add the changes files
codilar@codilar-Latitude-E5470:/var/www/html/marina$ sudo git add app/code/Codilar/CustomApi/Model/Helper/Data.php
codilar@codilar-Latitude-E5470:/var/www/html/marina$ sudo git add app/code/Codilar/CustomApi/etc/extension_attributes.xml
- run the rebase continue -- sudo git rebase --continue
codilar@codilar-Latitude-E5470:/var/www/html/marina$ sudo git rebase --continue
- push the code
- sudo git push sanjay(origin) test-task / sudo git push sanjay(origin) test-task -f
Info
git checkout -b app-MHIOS-1128-prod
git cherry-pick 6342db4d30216612baeb6926a4ab40cbe41de575
-
if any conflict -- resolve the conflict
-
add that conflict resolve file -- git add app/code/Codilar/CustomApi/etc/di.xml
-
git cherry-pick --continue
-
git cherry-pick 6342db4d30216612baeb6926a4ab40cbe41de575
-
continue the same