• Implementation of GIT rebase – I merging multiple commit


    brief introduction In the daily development, code changes are frequent. Sometimes you want to merge the previous submission into one submission. Here, you can use the GIT rebase – I command to complete it. Of course, the GIT rebase command is not only used for merge and commit, but also has many uses, such as […]

  • Explain the difference between git reset and hard


    Generally, we submit code in the process of GIT add, GIT commit – M and git push. Add to the temporary storage area, submit to git library to generate version number, and push to remote warehouse for others to use. This is a complete and very smooth process. However, the actual development is not so […]

  • Explain the difference between git reset — hard and git reset — soft


    Sometimes, an incorrect commit has been made, but the remote branch has not been pushed. If you want to undo the commit, you can use the GIT reset – – soft / hard command. 1. The difference between them is as follows Git reset – – soft: back to a certain version, only the commit […]

  • Explain the idea git reset option in detail


    1. Objectives Demonstrate the effect of GIT reset options in the figure below. 2. Git reset operation instructions The figure shows: his will reset the current branch head to the selected commit, and update the working tree and the index accoding to the seleted mode. intend: This action resets the current branch pointer to the […]

  • Git creates sub branches, merges branches and commits


    After git merges branches, the sub branches need to be submitted to git warehouse. At this time, the sub branches need to be submitted separately. The steps are as follows: 1. Create a sub branch and include the latest modified data under the current branch git checkout -b sonBranch 2. Submit all new branch contents […]

  • Git introduction to the nature of local warehouse and remote warehouse


    There is no big difference between local warehouse and remote warehouse in essence, but one is local computer and the other is remote computer Remote warehouses don’t have to begithubThat kind of special “central server”, even another computer in LAN, can also act as “central server”, because its original purpose is to facilitate the exchange […]

  • Analysis of GIT branch’s establishment and merger


    Creation and merging of branches Now let’s take a simple example of branching and merging. This workflow is also used in actual work Develop a website. To implement a new requirement, create a branch. Work on this branch. Suppose you suddenly receive a call saying that there is a very serious problem that needs urgent […]

  • Installation and basic configuration of GIT client in CentOS


    installThe current project uses git for version management, so it is necessary to learn about git installation. This article introduces the compilation and installation of GIT 1.9.0. Although it’s now 2.6.All commands should be executed under root.The first step is to install the dependency package.Before compiling and installing git, you should first install the necessary […]

  • How to build git version control server on CentOS


    1. Yum install git server Copy code The code is as follows: [[email protected] ~]# cd src/[[email protected] src]# wget http://dl.fedoraproject.org/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm[[email protected] src]# rpm -ivh epel-release-5-4.noarch.rpmPreparing… ########################################### [100%] package epel-release-5-4.noarch is already installed[[email protected] ~]# yum list[[email protected] ~]# yum install -y git 2. Create a git user to run git service Copy code The code is as follows: [[email protected] […]

  • Installation of gitlab client in CentOS


    Add EPEL warehouse Copy code The code is as follows: cat > /etc/yum.repos.d/epel.repo << EOF[epel]name=Extra Packages for Enterprise Linux 6 – \$basearch#baseurl=http://download.fedoraproject.org/pub/epel/6/\$basearchmirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=\$basearchfailovermethod=priorityenabled=1gpgcheck=0EOF Add puias computational reference Copy code The code is as follows: cat > /etc/yum.repos.d/PUIAS_6_computational.repo << EOF[PUIAS_6_computational]name=PUIAS computational Base \$releasever – \$basearchmirrorlist=http://puias.math.ias.edu/data/puias/computational/\$releasever/\$basearch/mirrorlist#baseurl=http://puias.math.ias.edu/data/puias/computational/\$releasever/\$basearchenabled=1gpgcheck=0EOF Install dependency package Copy code The code is as follows: yum -y […]

  • Introduction of gitlab client installation and configuration on Linux system


    1. Install the dependency packageKeep in mind that sudo is not installed by default in Debian, please use root to install it: Copy code The code is as follows: apt-get update && apt-get upgrade && apt-get install sudo Now you can install the required packages: Copy code The code is as follows: sudo apt-get updatesudo […]

  • Reason and solution of GIT pull failed when using git to pull code in idea


    Causes: Let’s talk about the difference between GIT and SVN, which will help us understand this problem better. When SVN updates a file from the server, SVN will automatically merge the file for you if there is a conflict between the file and the server. If there is a local file change that has not […]