(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
Git is a great but complex source code management system. It supports complex tasks, but is often considered too complex and not suitable for simple daily work. Let's be honest: Git is complicated and we should not pretend it is not. But I will still try to teach you how to work with (my) Basic Git and remote code libraries within 15 minutes. I will demonstrate the following steps, which usually help me build projects on one or more machines.
Create a remote empty code library (on
between Git and HG as its distributed version control system (initially only to support Hg). Since then, git warehouses have grown and many Hg warehouses have migrated to the Git repository. Searching for git on Google code returns 5m results, while search HG returns 16m results (Google added an open support for Hg in April 2009; So, Hg has 2.5 years of history, and Git is only six months on Google code).
Atlassian bought BitBucket last year, and
branch and switch it over
Git co-B # create a new new_branch Based on Branch
Git Co $ ID # checkout a historical commit record, but there is no branch information, switch to another branch will be automatically deleted
Git Co $ id-B # checkout a historical commit record and create a branch
Git Br-D # delete a branch
Git Br-D # force delete a branch (mandatory when unmerged branch is deleted)
Branch merge and rebase
Git merge # merge branch branches to the current Branch
Git merg
Git pull remote branch and merge to localgit fetch pull remote branch does not do merge ignore file. Gitignore Add file git Add. Commit all modifications git commit-am ' memo info ' push local branch to warehouse GIT push origin master:master Delete remote Branch git push origin:test from the remote code to the local repository Git pull Origin master:master create a new branch based on the branch git checkout-b dev2 master switch branch git checkout dev2 Delete Except local branch git branch-d d
be resolved first. After the conflict is resolved, the merge is completed.
Use git log -- graph to view the branch merge graph.
* Save the work site git stash. After saving, you can perform other work without affecting the last modification.
Recovery site: 1. The content in stash is not deleted when git stash apply is restored.
2. When git
distant libraryGit push–u (not required for the first time with-U) Origin master pushes the current master 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
libraryGit push–u (not required for the first time with-U) Origin master pushes the current master 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
)
Directory tree Browse for workspace, staging area, repository
Git ls-tree–l head (view current commit in repository) pointing to the directory tree
Git ls-files–s (view staging area) pointing to the directory tree
Submit command:
Git commit–m "Updage" (Commit staging area all modifications to repository)
Git commit–a (submit to Repository, including workspace content, this command is NOT recommended!!!) )
Save Work progress
Git sta
--NO-FF parameter, which means that Fast forwardis disabled:" Merge with No-ff the DevMerging branches, plus the--NO-FF parameter can be combined with the normal mode, the merged history has branches, can see that there has been a merger, and fast forward merge will not be seen to have been merged.First of all, the master branch should be very stable, that is, only to release the new version, usually do not work on it;So where do you work? Work on the Dev branch, that is, the dev branch is unsta
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 stash list view all hidden file listsGit stash apply to reco
When working with Git pull code, colleagues often encounter conflicting situations, prompting the following information:Error:your local changes to ' C/ENVIRON.C ' would is overwritten by merge. Aborting.please, commit your changes or stash them before you can merge.This means that there is a conflict between the updated content and the locally modified content, either by committing your changes or by temporarily storing the local changes first.The p
)7) Push Branchgit push Origin master: (pushes content from the master branch locally to the remote Library origin)8) Git Pull: (from a remote crawl branch)12.git Checkout-b DevCreate Branch Dev, equivalent to the following two commands:git branch Devgit checkout dev13.git Checkout Master: (cut back to master branch)14.git Merge Dev: (merge branch dev to current branch)This must be successful if the current branch and Dev are not in conflict (if both the current branch and Dev commit changes to
In the first case, there is no conflict:1.git Add.//Go to the center of the project to package the local file meaning2.git Pull Origin dev//Download the server's code locally if it is up-to-date and will prompt already up-to-date3.git commit-m "Search Complete"4.git push origin dev//means push the code to the server if you can't ctr+c and then push it.In the second case, there is a conflict:1.git Add.//Go to the center of the project to package the local file meaning2.git Pull Origin dev//Downlo
Today in the project, accidentally deleted a few folders, and push up, do not know how to recover, later through the Git restore to the previous version, the previous version of the folder after the copy, and then jump to the latest version, the copied files to the latest version:The action to use
Git stash
git log
Git checkout
*git Checkout
Git stash Apply
Git
git branch xxx new branch XXX
Git branch-a View all branches (including remote)
Git branch--set-upstream-to remotes/origin/xxx the current branch to the remote branch XXX
git checkout-b xxx remotes/origin/xxx maps remote branch xxx to local branch xxx (git pull is needed later)
Discard local modifications, forcing overrides using content from remote libraries
git fetch--allgit Reset--hard origin/mastergit fetch simply downloads the contents of the remote library and does not do an
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.