\n
![\"git](\"https:\/\/studysection.com\/blog\/wp-content\/uploads\/2020\/08\/git-remote-repo.png\")
<\/p>\nWhat we will cover in this post:<\/h3>\n\n- Basic commands of Git<\/li>\n
- How to make changes in the files<\/li>\n
- Sync my local repository with the remote repository<\/li>\n
- Add\/commit them<\/li>\n<\/ul>\n
Below is the list of some basic Git commands to get you going with Git:<\/h3>\n\n- Git Config: It configures the author name and email address that will be used with your commits.
\n\t\tgit config –global user.name “Abc Xyz”
\ngit config –global user.email abc@example.com<\/em><\/li>\n- Git Init: It will create a new Local Repository.
\n\t\tgit init<\/em><\/li>\n- Git Clone: It will create a working copy of a local repository.
\ngit clone \/path\/to\/repository<\/em><\/li>\n- Git Add: It adds one or more files to staging.
\ngit add <filename><\/em> \/\/to add a particular file
\ngit add * <\/em> \/\/to add all the files<\/li>\n- Git Commit: It commits the changes to the head but not yet to the remote repository.
\n\t\tgit commit -m “Commit Comment”<\/em><\/li>\n- Git Push: It will send the changes to the master branch of your remote repository.
\n\t\tgit push origin master<\/em><\/li>\n- Git Status: It will list all the files you’ve changed & those you still need to add or commit.
\n\t\tgit status<\/em><\/li>\n- Git Checkout\/Branch: To create branches and to switch between them.
\n\t\t\/\/Switch from one branch to another
\n\t\tgit checkout <branch><\/em>
\n\t\t\/\/Create a new branch and switch to it
\n\t\tgit checkout -b <branch><\/em>
\n\t\t\/\/List all the branches in your repository & tells you what branch you’re currently in
\n\t\tgit branch<\/em>
\n\t\t\/\/Delete the feature branch
\n\t\tgit branch -d <branch><\/em>
\n\t\t\/\/Push the branch to your remote repository
\n\t\tgit push origin <branch><\/em><\/li>\n- Git Pull: It will Fetch and merge changes from the remote server to your working directory.
\n\t\tgit pull<\/em><\/li>\n- Git Merge: It will merge a different branch into your current branch.
\ngit merge <branch><\/em>\t\t<\/li>\n- Git Add: After making changes to resolve conflicts manually, you mark the changed file.
\ngit add <filename><\/em>\t<\/li>\n- Git Diff: It will show you the merge changes.
\n\t\t\/\/View all the merge conflicts
\n\t\tgit diff<\/em>
\n\t\t\/\/View the conflicts against the base file
\n\t\tgit diff –base <filename><\/em>
\n\t\t\/\/Preview changes, before merging
\n\t\tgit diff <source-branch> <target-branch><\/em><\/li>\n<\/ol>\nThe basic workflow of Git:<\/h3>\n
Step 1 \u2212 Modify Local files.
\nStep 2 \u2212 Add these files to the staging area.
\nStep 3 \u2212 Commit these files will move them from the staging area. After Push operation, it stores the changes permanently to the Git repository.<\/p>\n
Step by Step commands to commit your code:<\/p>\n\n\n- Check status if you are in your branch or not.
\ngit status<\/em><\/li>\n- If you are not in your branch which you want to commit (If you are already in your branch you can skip this step). Go to your branch using-
\n\t\tgit checkout <your branch name><\/em><\/li>\n- Add the files you want to commit. This will take files to the staging area, not on the repository.
\n\t\tgit add –all <\/em> \/\/to add all files
\ngit add . <\/em> \/\/to add all files
\ngit add <filename><\/em>\t\/\/particular file<\/li>\n- Now use below command, to push code to the repository.
\n\t\tgit push origin <your-branch-name><\/em><\/li>\n<\/ol>\nStep by Step commands to take a pull from the remote repository to your local:<\/h3>\n
Below is the list of some basic Git commands to get you going with Git:<\/h3>\n\n- Git Config: It configures the author name and email address that will be used with your commits.
\n\t\tgit config –global user.name “Abc Xyz”
\ngit config –global user.email abc@example.com<\/em><\/li>\n- Git Init: It will create a new Local Repository.
\n\t\tgit init<\/em><\/li>\n- Git Clone: It will create a working copy of a local repository.
\ngit clone \/path\/to\/repository<\/em><\/li>\n- Git Add: It adds one or more files to staging.
\ngit add <filename><\/em> \/\/to add a particular file
\ngit add * <\/em> \/\/to add all the files<\/li>\n- Git Commit: It commits the changes to the head but not yet to the remote repository.
\n\t\tgit commit -m “Commit Comment”<\/em><\/li>\n- Git Push: It will send the changes to the master branch of your remote repository.
\n\t\tgit push origin master<\/em><\/li>\n- Git Status: It will list all the files you’ve changed & those you still need to add or commit.
\n\t\tgit status<\/em><\/li>\n- Git Checkout\/Branch: To create branches and to switch between them.
\n\t\t\/\/Switch from one branch to another
\n\t\tgit checkout <branch><\/em>
\n\t\t\/\/Create a new branch and switch to it
\n\t\tgit checkout -b <branch><\/em>
\n\t\t\/\/List all the branches in your repository & tells you what branch you’re currently in
\n\t\tgit branch<\/em>
\n\t\t\/\/Delete the feature branch
\n\t\tgit branch -d <branch><\/em>
\n\t\t\/\/Push the branch to your remote repository
\n\t\tgit push origin <branch><\/em><\/li>\n- Git Pull: It will Fetch and merge changes from the remote server to your working directory.
\n\t\tgit pull<\/em><\/li>\n- Git Merge: It will merge a different branch into your current branch.
\ngit merge <branch><\/em>\t\t<\/li>\n- Git Add: After making changes to resolve conflicts manually, you mark the changed file.
\ngit add <filename><\/em>\t<\/li>\n- Git Diff: It will show you the merge changes.
\n\t\t\/\/View all the merge conflicts
\n\t\tgit diff<\/em>
\n\t\t\/\/View the conflicts against the base file
\n\t\tgit diff –base <filename><\/em>
\n\t\t\/\/Preview changes, before merging
\n\t\tgit diff <source-branch> <target-branch><\/em><\/li>\n<\/ol>\nThe basic workflow of Git:<\/h3>\n
Step 1 \u2212 Modify Local files.
\nStep 2 \u2212 Add these files to the staging area.
\nStep 3 \u2212 Commit these files will move them from the staging area. After Push operation, it stores the changes permanently to the Git repository.<\/p>\n
Step by Step commands to commit your code:<\/p>\n\n\n- Check status if you are in your branch or not.
\ngit status<\/em><\/li>\n- If you are not in your branch which you want to commit (If you are already in your branch you can skip this step). Go to your branch using-
\n\t\tgit checkout <your branch name><\/em><\/li>\n- Add the files you want to commit. This will take files to the staging area, not on the repository.
\n\t\tgit add –all <\/em> \/\/to add all files
\ngit add . <\/em> \/\/to add all files
\ngit add <filename><\/em>\t\/\/particular file<\/li>\n- Now use below command, to push code to the repository.
\n\t\tgit push origin <your-branch-name><\/em><\/li>\n<\/ol>\nStep by Step commands to take a pull from the remote repository to your local:<\/h3>\n
\n\t\tgit config –global user.name “Abc Xyz”
\ngit config –global user.email abc@example.com<\/em><\/li>\n
\n\t\tgit init<\/em><\/li>\n
\ngit clone \/path\/to\/repository<\/em><\/li>\n
\ngit add <filename><\/em> \/\/to add a particular file
\ngit add * <\/em> \/\/to add all the files<\/li>\n
\n\t\tgit commit -m “Commit Comment”<\/em><\/li>\n
\n\t\tgit push origin master<\/em><\/li>\n
\n\t\tgit status<\/em><\/li>\n
\n\t\t\/\/Switch from one branch to another
\n\t\tgit checkout <branch><\/em>
\n\t\t\/\/Create a new branch and switch to it
\n\t\tgit checkout -b <branch><\/em>
\n\t\t\/\/List all the branches in your repository & tells you what branch you’re currently in
\n\t\tgit branch<\/em>
\n\t\t\/\/Delete the feature branch
\n\t\tgit branch -d <branch><\/em>
\n\t\t\/\/Push the branch to your remote repository
\n\t\tgit push origin <branch><\/em><\/li>\n
\n\t\tgit pull<\/em><\/li>\n
\ngit merge <branch><\/em>\t\t<\/li>\n
\ngit add <filename><\/em>\t<\/li>\n
\n\t\t\/\/View all the merge conflicts
\n\t\tgit diff<\/em>
\n\t\t\/\/View the conflicts against the base file
\n\t\tgit diff –base <filename><\/em>
\n\t\t\/\/Preview changes, before merging
\n\t\tgit diff <source-branch> <target-branch><\/em><\/li>\n<\/ol>\n
The basic workflow of Git:<\/h3>\n
Step 1 \u2212 Modify Local files.
\nStep 2 \u2212 Add these files to the staging area.
\nStep 3 \u2212 Commit these files will move them from the staging area. After Push operation, it stores the changes permanently to the Git repository.<\/p>\n
Step by Step commands to commit your code:<\/p>\n\n\n- Check status if you are in your branch or not.
\ngit status<\/em><\/li>\n- If you are not in your branch which you want to commit (If you are already in your branch you can skip this step). Go to your branch using-
\n\t\tgit checkout <your branch name><\/em><\/li>\n- Add the files you want to commit. This will take files to the staging area, not on the repository.
\n\t\tgit add –all <\/em> \/\/to add all files
\ngit add . <\/em> \/\/to add all files
\ngit add <filename><\/em>\t\/\/particular file<\/li>\n- Now use below command, to push code to the repository.
\n\t\tgit push origin <your-branch-name><\/em><\/li>\n<\/ol>\nStep by Step commands to take a pull from the remote repository to your local:<\/h3>\n
- \n
- Check status if you are in your branch or not.
\ngit status<\/em><\/li>\n- If you are not in your branch which you want to commit (If you are already in your branch you can skip this step). Go to your branch using-
\n\t\tgit checkout <your branch name><\/em><\/li>\n- Add the files you want to commit. This will take files to the staging area, not on the repository.
\n\t\tgit add –all <\/em> \/\/to add all files
\ngit add . <\/em> \/\/to add all files
\ngit add <filename><\/em>\t\/\/particular file<\/li>\n- Now use below command, to push code to the repository.
\n\t\tgit push origin <your-branch-name><\/em><\/li>\n<\/ol>\nStep by Step commands to take a pull from the remote repository to your local:<\/h3>\n
- If you are not in your branch which you want to commit (If you are already in your branch you can skip this step). Go to your branch using-