Getting started with git commands

Set user information

This should be the first step to install git. We will add the user information (username and email), so when we commit the code, a commit message will be generated with the user information, which makes it easier to track the commit process. To add user information, the command is git config:

$ git config --global user.name "Daniel"
$ git config --global user.email "[email protected]"

After adding user information, we will check whether the information is successfully updated by running the following command.

$ git config --list

We should be able to see the output user information.

GIT Command

Create a new warehouse

To create a new repository, run the following command:

$ git init

Find a warehouse

To find a warehouse, the command is as follows:

$ git grep "repository"

Connecting to the remote warehouse

To connect to the remote repository, run the following command:

$ git remote add origin remote_server

Then check all configured remote servers and run the following command:

$ git remote -v

Clone a repository

To clone a repository from the local server, run the following code:

$ git clone repository_path

If we want to clone a warehouse on the remote server, the command to clone the warehouse is:

$ git clone repository_path

List branches in the repository

To check the list of all available and currently working branches, execute:

$ git branch

Create a new branch

Create and use a new branch, the command is:

$ git checkout -b 'branchname'

Delete a branch

To delete a branch, execute:

$ git branch -d 'branchname'

To delete a branch of the remote warehouse, execute:

$ git push origin:'branchname'

Switch to another branch

To switch from the current branch to another branch, use

$ git checkout 'branchname'

add files

Add files to the warehouse and execute:

$ git add filename

File Status

To check the file status (those files that will be submitted or added), execute:

$ git status

Commit changes

After we add a file or make changes to a file, we commit the code by running the following command:

$ git commit -a

Submit changes to head but not to the remote warehouse. The command is:

$ git commit -m "message"

Push changes

Push the changes made to the master branch of the warehouse, run:

$ git push origin master

Push branch to warehouse

Push changes made to a single branch to the remote warehouse, run:

$ git push origin 'branchname'

Push all branches to the remote warehouse and run:

$ git push -all origin

Merge two branches

To merge another branch into the current active branch, use the command:

$ git merge 'branchname'

Merge from remote server to local server

Download/pull changes from the remote server to the working directory of the local server, run:

$ git pull

Check merge conflicts

To view the merge conflicts of library files, run:

$ git diff -base 'filename'

To view all conflicts, run:

$ git diff

If we want to preview all changes before merging, run:

$ git diff 'source-branch' 'target-branch'

Create tag

To create a marker to mark any important changes, run:

$ git tag 'tag number' 'commit id'

We can find the commit id by running the following command:

$ git log

Push tag

Push all created tags to the remote server, run:

$ git push -tags origin

Reply to changes made

If we want to replace the changes to the current working tree with the last change in head, run:

$ git checkout -'filename'

We can also get the latest history from the remote server and point it to the master branch of the local warehouse instead of discarding all local changes. To do this, run:

$ git fetch origin
$ git reset -hard master

Okay, guys. These are the commands we use with the git server. We will bring you more interesting tutorials soon. If you would like us to write a tutorial on a specific topic, please let us know via the comment box below. As always, your comments and suggestions are welcome.

---

The above is the detailed content of Getting started with git commands. For more information, please follow other related articles on the PHP Chinese website!