stash stsh

) $ git commit-m "fixed" [Master 51e165e] FixedThe message tells us that the problem has been resolved. Then we can delete the Dev2 branch.$ git branch-d dev2deleted branch Dev2 (was 046661c).！ Note: Our previous split-to-merge operations are performed in quick mode, but when you delete a branch in this mode, the branch information is lost. Therefore, we can also adopt the No-ff method when merging the branches, as below, interested friends can test themselves.$ git nerge--no-ff-m "merge with No

Interactive_Rebasing.markdownNow we can see that the first 4 files have been staged, but the last one is not. Basically, this is a more compact way to view the state, and the actual information is consistent with the fact that we run ' git status ' on the command line:$ git statusVi. Storage 1. StorageWhen you are doing a complex job, you find a bug that is not relevant to your current job but is annoying. You want to fix the bug and do the work at hand, then you can use Git

use of branchinggit branch Git checkout-b Branching policy : First of all, themaster 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, thedev branch is unstable, at some point, such as the 1.0 release, then merge the Dev branch to Master , in the master Branch Release version 1.0; You and your little friends each work on the Dev Branch, and everyone has their own branch, and it's time to me

the specified branch to the current branch, and discards the branch information after the branch is deleted.If a conflict occurs, Git uses to mark the contents of different branches. You need to modify and then run git commit . $ git merge--no-ff-m "Submission Instructions" It is recommended to use Normal mode to merge branches, the merged history has branches, can see that there has been a merger, and Fast forward merge can not be seen to have been merged. $

: Delete files in your working directory that are not versioned by gitStashed Branches　　StashGit stash (Gsta): Move all staging area files to the "storage area", similar to another type of work areaGit stash list: View storage queue (Stash lists)Git stash apply: Restore the most recent storage to staging area (you can

files: Git ls-files–deletedRecovery requires the new Checkout:git checkout–Simultaneous operation of multiple files can be done using XargsGit ls-fies-d | Xargs git Checkout--git checkout-f recover deleted filesIgnore committing certain files or folders1. Writing a file name or directory name within a. gitignore file ignores the commit, but only for files or directories that are not track-only, and is not valid for files that have been added to the version management.2. Files or directories tha

--hard head^ back to the previous version, and if you accidentally change the wrong code, fall back to the previous version and modify it again.Git reset--hard version number refers to the top 5 digits.Git checkout-the file name directly discards the workspace modification and does not do add,commit operation.Git rest headIf it is already commit, the version is rolled back directly.Branchgit checkout-b git chekout Git branch View all branches with * Description is the branch of the current opera

file, I set Co as the checkout alias. Next time I use 'git Co new_branch ', I can switch to the new_branch branch, which is concise and elegant; set CI to the alias of commit-a. The-A option indicates that I do not need to add the modified and deleted files to the index using the 'git add' command, in this way, when the command 'git ci-M "message" 'is used, the command 'git add files modified and deleted 'and 'git commit-M "message' are executed consecutively, saving our precious time; the cool

work is not finished, first put the work site Git stash, and then to fix the bug, repair, then git stash pop, back to the job site. Store current working state: Git Stash View a list of stored work states: Git stash list Retrieve work Status: 1, git stash apply (remove the

the last two lines, which will be described in the following sections. Git provides many elegant and user-friendly options. If we combine the alias settings, we can use your imagination to make your own Git live. Color: Is it painful to watch diff every time? So why don't we add color to our Git? You only need to add the three lines to display the red and green prompts on your console. Git agility Now let's talk about the usage and skills of the 'git log', 'git

Transferred from: HTTPS://GITHUB.COM/KAIYE/KAIYE.GITHUB.COM/ISSUES/7After mastering the basics of Git use, you may encounter some problems. The following are some of the problems that cat Brother screening summary, share to friends, master the points in these questions, Git advanced also completed, it contains the following sections: How to modify Origin warehouse information How to configure Git ssh keys How to undo Changes How to solve the conflict Git

git resolves local conflicts The process is very simple, mainly using the git stash command for processing, divided into the following steps to deal with. 1. Store local Modifications first $ git stashThis allows all local modifications to be temporarily stored. is to use Git stash list to see the saved information: Git stash Staging changesGit

$ Gitlog -- graph -- oneline $ gitreset -- hard version uses reflog to save the wrong reset [jackluo @ localhostdemo] $ gitreflogshowmaster | head-5 reset $ gitreset -- hardmaster @ {2} ls $ $ Git log -- graph -- oneline $ git reset -- hard version number Use reflog to save wrong reset [Jackluo @ localhost demo] $ git reflog show master | head-5Reset $ Git reset -- hard master @ {2} Ls $ Git log -- oneline Git reflog show master | head-5 ================================== Git clean-nd delete Git

two commits modified the same line of the same file, and git does not know which one to apply. This causes the error message to resemble the following: Git will give you 3 choices to fix the commit that caused the conflict (fa39187): You can run git rebase--abort to completely de-base the variable. Doing so cancels the change-base modification and resets the branch back to the state it was before executing git rebase. You can run git rebase--skip to completely ignore the commit. In this way, t

Chinese name, the following is displayed: The stash Command uses the scene, as you are modifying the code on a branch a, but there is an urgent task that requires you to switch to another branch B to do some work, and the code on a is still a dabbler, Do not want to go to commit or even do not want to add, this time the Stash command is of great use, if no commit is executed git

and you have not been asked to change it again until the next review. You've got some extra commits before you know it's going to change again. Ideally, you can compress multiple commits into one using the rebase command.? 1 gitrebase-iHEAD~[number_of_commits] If you want to compress the last two commits, you need to run the following command.? 1 gitrebase-iHEAD~2 When

when useful $ git diff [file] # Compare the current file and the staging area file difference $ git diff [$id] [$id] # Compare the differences between two commits $ git diff [Branch1]. [BRANCH2] # Compare $ git diff--staged # between two branches compare staging area and repository diff $ git diff--cached # compare staging Zone and Workspace diff $ git diff--stat # Just compare statistics $ git stash # staging work currently in

working directory tree. 20. Git cleanGit clean removes files without track from the working directory. the common parameter is GIT clean-DF:-D, indicating that the directory is removed at the same time, and-F indicates force, because in the GIT configuration file, clean. requireforce = true. If-F is not added, clean will reject execution. 21. Git mvGit Rm--cached orig; MV orig new; git add new 22. Git stashPress the current change into a stack. git stash