![]() ![]() This is similar to the previous mode, but lets you use the interactive interface to show the "diff" output and choose which hunks to use in the result. With -m, changes made to the working tree file can be discarded to re-create the original conflicted merge result. The contents from a specific side of the merge can be checked out of the index by using -ours or -theirs. 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 fail and nothing will be checked out. The index may contain unmerged entries because of a previous failed merge. When the is given, overwrite both the index and the working tree with the contents at the. When the (most often a commit) is not given, overwrite working tree with the contents in the index. Overwrite the contents of the files that match the pathspec. git checkout … git checkout -pathspec-from-file= Omitting detaches HEAD at the tip of the current branch. would check out that branch without detaching HEAD). When the argument is a branch name, the -detach option can be used to detach HEAD at the tip of the branch ( git checkout Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications. ![]() ![]() Prepare to work on top of, by detaching HEAD at it (see "DETACHED HEAD" section), and updating the index and the files in the working tree. That is to say, the branch is not reset/created unless "git checkout" is successful. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |