stash stsh

. If you do, do not panic, because as long as git generally does not actively delete the contents of the local repository, depending on the situation you lost, can be retrieved, such as after the loss can use git reset--hard orig_head immediate recovery, or use Reflog command to view a reference to a previous branch.3.4 StashSometimes, we do some work on one branch and modify a lot of code, and then we need to switch to another branch to do something else. But do not want to do only half of the

, it's usually checkout to make sure there's no conflict.-M"Merge" //Tips for Merging*********************************************************************************************see the following situation to pay attention to conflict. Don't forget to resolve the conflict.*********************************************************************************************master should be published directly. So there should be no conflict when merging to master, so it is not recommended that multi

...//create and switch branches equivalent to git branch b_name git checkout b_nameGIT branch b_name//Create branch PS: Create branch clone from current branchgit checkout b_name//Toggle BranchGit branch//view Current Branch branch operation use this command plus option (-D Delete-D to delete an unincorporated branch) checkout just toggle (-B does not exist will be created)git merge b_name//merge current branch with specified branch--no-ff-m "commit_msg" commit record for this mergegit--graph--

, which is the default origin18, Git branch: View branch.Add:Git branch--set-upstream branch-name origin/branch-name: Create a link relationship between the native branch and the remote branch.Git branch--set-upstream-to=o/server_side_branch_name your_branch_name19, Git branch 20, Git checkout Add:git checkout git checkout "@{10 minutes Age}": Switch to version 10 minutes ago (Commit-id)Git checkout "@{5}": Switch to the 5th to the bottom of the Commit-id.21, Git checkout-b Add:Equivalent to the

In ~ /Directory Create or modify a file gedit. gitconfig Copy the following to the default configuration. [Color] Ui = auto [User] Name = w22ee Email = w22ee@126.com [Alias] St = Status Ci = commit BR = Branch CO = checkout CVSup =! Sh-C \ "Git stash git cvsimport-v-K-I git rebase origin git stash pop \" Svnup =! Sh-C \ "Git stash git SVN rebase git

Git rm Git rm -- cached Storage and recovery Git stash # store the current jobGit stash list # view the storage siteGit stash apply # restore the work site. The stash content is not deleted.Git stash pop # restore the work site and delete the

branch. You can merge them on the dev branch from time to time. 3. Bug Branch Git provides a stash function to "Store" the current work site and resume the work after it recovers: $ git stash Restore and delete the stash after fixing the bug. $ git stash pop View stash $ gi

) (delete an associated remote database name)Git remote-V (list the names of associated remote libraries)Git clone [email protected]: path/repo-name.git (clone a remote library to a local, clone the master branch by default)Git checkout-B Dev origin/dev (create a local branch, switch to the branch, and associate the branch of a remote database to the local branch)Git log -- Graph (view branch merge graph)Git merge -- no-FF-M "merge with no-FF" branch nameGit

details stash // a cache mechanism Status // view git status gitk // graphical interface to view all the COMIT of the current branch, similar to the gitlog GUI version Most git commands require the current directory (or the ancestor directory of the current directory) to exist. the GIT folder can be executed only in the following situations: 1. git config -- Global xxxx // git global settings 2. git init // initialize git3. git clone // copy Reposito

-commitWhen a bug is temporarily modified, to ensure that the current workspace looks cleanTo store the current unfinished work site.Git stashView a stored workspacegit stash List[Email protected] {0}: WIP on b1:38b2a71 Modify p.phpRecovering a stored workspacegit stash apply [email protected]{0} (after recovery stash content is not deleted) need to use Git

filesgitls-files-tShow all untracked branchesgitls-files--othersShow all ignored filesgitls-files--others-i--exclude-standardgitcheck-ignore*gitstatus--ignoredManipulation: OperationStops tracing a file but does not delete it.gitrm--cachedOrgitrm--cached-rForce Delete untracked files or directoriesgitclean-fgitclean-f-dgitclean-dfClear. gitignoregitclean-X-fChanges: ModifyInfo: View informationView unsaved files after last submissiongitdiffView the files for temporary changes to be submittedgit

the stage.2.2 then execute git rebase-continue to directly create another patch.Repeat 2.1, 2.2 Until rebase is complete. Note that the rebase does not need to explicitly execute commit. Commit is automatically completed by git.3. You can use git diff to view conflicts. Git diff has different meanings in different scenarios. Git pull: It is equivalent to git fetch + git merge. If git merge is a quick merge, a commit point is formed.The commit point corresponding to git merge can be referred to

.; Git add-u;Git add-a4. Submission:(1) From staging area I to local warehouse Lgit commit-m [Submit message](2)5. Revocation(1) From staging area I to work area Wgit rm--cached (2) Revert to head versiongit reset--hard HEAD(3) Modify the submitted user name informationgit commit--amend--author= "author Name 6. Remote(1) Change the remote warehouse addressgit remote Set-url origin http://xxx.xx.com/x.git(2) View Remote warehouse logsgit log origin/master(3) Compare local and remote branchesgit d

demand, suddenly this self-happy development way is interrupted, a test branch has a bug needs to be repaired immediately, wipe, the local code has not been submitted, but do not want to because of the temporary submission of local code to describe how the temporary submission of the description. You can then use Git stash to access locally changed code, and then switch to the bug's branch to solve the problem, and finally go back to this point using

branch before deleting [D forcibly delete]Git push origin:p Age Delete Remote Branch pageCat Read.txt Viewing file contents (conflicts)git log--graph View branch merge situationgit log--graph--pretty=oneline--abbrev-commit View recent branch mergesGit stash hide the current workspacegit stath list view hidden workspacesgit stash apply stash{0} restores hidden wo

, so with the-m parameter, write the commit description in:$ git merge--no-ff-m "merge with No-ff The Dev"Store" The current Job site:$ git stashview a list of stored work sites:$ git stash listRestore the "storage" work site and also delete the stash content:$ git stash popRestore the "storage" work site without deleting sta