Shulou(Shulou.com)06/02 Report--

This article mainly introduces "what are the Git principles and commonly used commands". In daily operation, I believe many people have doubts about Git principles and common commands. The editor consulted all kinds of materials and sorted out simple and easy-to-use operation methods. I hope it will be helpful to answer the doubts about "Git principles and commonly used commands". Next, please follow the editor to study!

I. Preface

What is Git?

Open source distributed version control system can effectively and high-speed deal with project version management from very small to very large. An open source version control software originally developed to help manage Linux kernel development.

From the general developer's point of view, git has the following features:

1. Clone the complete Git repository (including code and version information) from the server to a stand-alone machine.

2. Create branches and modify code on your own machine according to different development purposes.

3. Submit the code on the branch created by yourself on the stand-alone.

4. Merge branches on a single machine.

5. Fetch the latest version of the code on the server and merge it with your main branch.

6. Generate a patch (patch) and send it to the main developer.

7. According to the feedback from the master developer, if the master developer finds that there is a conflict between two general developers (conflicts that they can work together to resolve), they will be asked to resolve the conflict first, and then submitted by one of them. If the main developer can solve it on his own, or if there is no conflict, pass.

8. General methods for resolving conflicts among developers. Developers can use the pull command to resolve conflicts, and then submit patches to the master developer after resolving the conflicts.

Second, Git principle: 1. Work area (Working Directory)

This is the directory you can see on your computer, the directory or folder in which you are developing. When we create a new directory or folder, the contents are placed in the workspace.

two。 Version Library (Repository)

The workspace has a hidden directory. Git, which is not a workspace, but a version library of Git.

There are many things in Git's version library, the most important of which are the temporary storage area called stage (or index), the first branch master that Git automatically created for us, and a pointer to master called HEAD. The general structure is as follows:

3. How to get from the workspace to the staging area:

When we add files to the Git version library, we do this in two steps:

The first step is to add the file using git add, which is actually adding file changes to the staging area (indexed by the version library)

The second step is to commit the changes using git commit, which essentially commits all the contents of the staging area to the current branch.

Because Git automatically created the only master branch for us when we created the Git version library, git commit is now committing changes to the master branch.

4. Common work scenarios are as follows:

III. Common commands

Remote correlation:

Git remote add origin git://xxx is associated with a remote branch, where origin is the alias of the remote repository

Git remote remove origin disassociates branches

Push related operations:

Git push origin:

Git push-u origin master / / by default this statement is equivalent to submitting a local master repository to a remote warehouse as a remote master branch

Git push origin test:test / / submit a local test branch as a remote test branch

Git push origin test:master / / submit a local test branch as a remote master branch

Pull related commands

Git pull origin:

Git pull origin next:master / / merge the remote next branch with the local master branch

Git pull origin next / / merge the remote next branch with the current branch

Git pull origin / / if there is a tracking relationship between the current branch and the remote branch, git pull can omit the remote branch name.

Other:

Git checkout-b dev / / create and switch to the dev branch

Git merge dev / / merge the dev branch to the current branch

Git checkout dev / / switch to the dev branch

Git branch dev / / create a dev branch

Common scenarios:

1. After you commit this change to the bugfix branch, you also need to submit it to the dev branch. Then switch to the dev branch and execute the following command:

Git cherry-pick commitid / / commits a branch's submission again in the current branch. It can also be executed in the same branch.

Git cherry-pick commitid1.. Commitid1 / / commits the submission between commitid1 and commitid1 of a branch in the current branch again.

two。 In the current branch A to modify the code in the middle, but also need to immediately cut to another branch B to solve the thorny problem, but do not want to submit the code of branch A. If you force a cut to branch B, the changes to branch A will be discarded. Using stash, you can cache the current changes:

Git stash save "xxx" / / name the current cached content "xxx" to facilitate recording of the version

Note: files that are staged and not temporarily (indexed) are cached by default.

Git stash list / / View all cached content

Git stash pop/apply / / pop pops up the top of the cache stack and applies it to the current branch. Apply applies the top of the cache stack to the current branch without popping up.

Git stash pop/apply stash@103 / / apply specified cache content

Git stash clear / / clear all caches

Git stash drop stash@104 / / Delete the specified cache, default top of stack

IntelligJ idea uses Git V, Eclipse uses Git

Https://my.oschina.net/woniuyi/blog/3103613

At this point, the study of "what are the principles of Git and commonly used commands" is over. I hope to be able to solve your doubts. The collocation of theory and practice can better help you learn, go and try it! If you want to continue to learn more related knowledge, please continue to follow the website, the editor will continue to work hard to bring you more practical articles!

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.