When checking out paths from the index, do not fail upon unmerged entries instead, unmerged entries are ignored. This is used to throw away local changes. ![]() When switching branches, proceed even if the index or the working tree differs from HEAD. With -m, changes made to the working tree file can be discarded to recreate the original conflicted merge The contents from a specific side of the merge can be checked out of the Using -f will ignore these unmerged entries. By default, if you try to check out such an entry from the index, the checkout operation willįail and nothing will be checked out. The index may contain unmerged entries after a failed merge. commit, tag or tree) to update the index for the given paths before updating the The argument can be used to specify a specific tree-ish (i.e. In this case, the -b and -track options are meaningless and giving either of them results in an error. It updates the named paths in the working tree from the index file, When or -patch are given, this command does not switch branches. ![]() As a convenience, -track without -b implies branch creation see the description of -track below. If -b is given, a new branch is created and checked out, as if git-branch(1) were called in this case you can use the -track or -no-track options, When are not given, this command switches branches by updating the index, working tree, and HEAD to reflect the specified branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |