stash bbb

"XX" commits a file –m followed by a comment.Git Status View warehouse statusgit diff xx View xx file modified those contentgit log View historygit reset–hard head^ or git reset–hard head~ fallback to previous version(If you want to fallback to 100 versions, use Git Reset–hard head~100)Cat xx View XX file contentsGit reflog View history's version number IDGit checkout-xx all the changes to the XX file in the workspace.git rm xx Delete xx fileGit remote add Origin https://github.com/tugenhua0707

branch to the remote librarygit clone https://github.com/tugenhua0707/testgit cloning from a remote repositorygit checkout–b dev Create dev branch and switch to Dev branchGit branch view all current branchesGit checkout master switches back to the master branchgit merge dev branches on the current branchgit branch–d dev Delete Dev branchGIT branch name to create a branchGit stash to hide the current job and resume work after resuming the site.Git

branchname5. Merging branchesgit merge Otherbranch # merges the current branch with the Otherbranchgit rebase # Update the newest branchFour, version library1. Initialize1. Git init # Initializes a repository2. Git clone address # clone remote code3. Git remote add orgin address # Add the Repository OriginFive, advanced features1. Temporary Storage Managementgit stash # cache Current Changesgit stash List

Level four modeWorkspace Staging Area local warehouse remote Warehousegit config--global user.name "YourName"git confit--global user.email "Youremail"Git initgit Add FileGit commit-m "somecomments"git statusgit diff file to see the difference between the workspace and the local warehousegit log--pretty=onelinegit reset--hard head^ (head~100)git reset--hard 123456 (version number)Git refloggit diff HEAD--The difference between the latest version of file and the workspaceGit checkout--the same as

Recently encountered a problem, things are like this, just received a customer said his project has a problem, so open the local source view after the troubleshooting to determine the problem, and then began to fix the problem to get ready to commit to git to find the current branch is not right, But the problem is that I have made a lot of changes in the current branch, and if you want to switch branches, you must first commit the modified files. So now the question is: how do I switch branches

information for each branch git br--merged # View branches that have been merged into the current branch git br--no-merged # View branches that have not been merged into the current branch Git Co Git co-b git co-b Git Co $id # Checkout A history commit record, but without branching information, switching to another branch will automatically delete Git co $id-B git br-d git br-d Branch Merging and RebaseC code git merge git merge origin/master--no-

delete branchesC code Git br-r # View Remote Branch git br Git br-v # View the last commit information for each branch git br--merged # View branches that have been merged into the current branch git br--no-merged # View branches that have not been merged into the current branch Git Co Git co-b git co-b Git Co $id # Checkout A history commit record, but without branching information, switching to another branch will automatically delete Git co $id-B git br-

time with-u) originmaster push the current master branch to the remote libraryGit clonehttps://github.com/tugenhua0707/testgit cloning from a remote repositorygit checkout–b dev Create dev branch and switch to Dev branchGit branch view all current branchesGit checkout master switches back to the master branchGit mergedev merges the Dev branch on the current branchgit branch–d dev Delete Dev branchGIT branch name to create a branchGit stash to hide th

Temporary Management Git stash # temporary storage Git stash list # list all stash Columns Git stash apply # restore saved content Git stash drop # delete a staging area Git remote branch management (origin is the name of the remote repository) Git pull # capture updates fr

(resubmit the file again).git log--graph: View Branch Merge diagramGit stash hide the current workspacegit stash pop: Restore stash content and delete stash contentSummary: ①bug Branch--when fixing a bug, we will fix it by creating a new bug, then merge and finally delete it, and when the work is not finished, first p

Recently learned Git rebase, feel very cool appearance,It turned out to be a slap in the face today. Git pull--rebase Error: Cannot rebase:you have unstaged changes please commit or stash them. The first reaction is:No. Can Yes. Just now it was clearly submitted. How can there be changes. Hysterical. Finally with git status a look: 。。。。 I was wrong... Take a call and forget about the deletion of the file--. Summary: 1.git pull–rebase Understand

: Cloning from the remote librarygit checkout-b Dev: Create Dev Branch and switch to Dev branchgit branch: View all current branchesgit checkout Master: Switch back to master branchgit merge dev: Merges the Dev branch on the current branch git branch-d Dev: Delete Dev Branchgit branch name: Creating a Branchgit stash: Hide the current work and resume work after resuming the site.git stash list: View a list

current master branch to the remote library git clone https://github.com/tugenhua0707/testgit cloning from a remote repository git checkout–b dev Create dev branch and switch to Dev branch Git branch view all current branches Git checkout master switches back to the master branch git merge dev branches on the current branch git branch–d dev Delete Dev branch GIT branch name to create a branch Git stash to hide the current job and resume work after re

currently pointing to has more than one *3, Switch branch is git checkout branchname4. Merge branch: git merge branchname merge branchname to current branch5. Delete branch: git branch-d branchname Delete branchname BranchNote: creating, merging, and deleting branches are very fast, git encourages the use of branching to complete a task, deleting branches after merging, and working directly on the master branch is the same effect, but the process is much more secure, because in these processes

If there are some configuration files on the system that have been configured on the server and then later developed and then added some new configuration items, A code violation occurs when this profile is published: Error:your local changes to the following files would is overwritten by merge:protected/config/main.phpPlease, commit your changes or stash them before you can merge. If you want to keep the changes made on the production server, simp

When you use git pull code, you often encounter conflicts such as the following: Error:your local changes to the following files would is overwritten by merge:Dpcm/src/struts.xmlPlease, commit your changes or stash them before you can merge. In this case, you can use the following steps to resolve First: Store files that are locally conflicting with the server first. $ git stash Second: Use the

[variable name]:[branch name]This command deletes the branch on the remote repository.Git pullUsage: git pull [Repository Link]This command extracts and merges changes from the remote server into your working directory.Git stashUsage: git stash saveThis command temporarily stores all modified trace files.Usage: git stash popThis command restores the most recently hidden files.Usage: git

, 'Finance Department '); insert into tb values (2, 'hr Department'); insert into tb values (3, 'Science and Technology Department '); insert into ta values (1, 'Liu bei ', 1); insert into ta values (2, 'guan Yu', 2); insert into ta values (3, 'zhang Fei ', 3); mysql> select * from ta; + ---- + ------ + ------- + | id | name | tb_id | + ---- + ------ + ------- + | 1 | aaa | 1 | 2 | bbb | 2 | 3 | bbb | 4 | +