git checkout HEAD^(检出前一版本的代码) git checkout -b branch_name(检出并创建新分支) git checkout branch_name (切换到某分支) git checkout -f branch_name(强制切换到某分支) 9. git reset:重置代码 常见用法 git reset 5a5d53e(重置版本库和暂存区)
git diff HEAD#比较当前工作区和上一次提交时文件的差异git diff HEAD^#比较上一次提交和上上次提交的文件差异git diff 分支名#查看当前分支跟指定的分支的差异git diff 分支名1 分支名2#查看两个指定分支(已提交的)的差异,分支2 跟分支1的差别git diff --name-only --diff-filter=U#查看冲突文件 这个太有...
范例：正确答案是git checkout -m origin/master它将原始master分支中的更改与本地甚至未提交的更改合并。
When the<commit>argument is a branch name, the--detachoption can be used to detachHEADat the tip of the branch (git checkout <branch>would check out that branch without detachingHEAD). Omitting<branch>detachesHEADat the tip of the current branch. ...
git 将空存储库中的当前分支 checkout 到工作树当这个工作树工作时，我实际上只是把本地的裸repo当作...
在版本回退里,你已经知道,每次提交,Git都把它们串成一条时间线,这条时间线就是一个分支。截止到目前,只有一条时间线,在Git里,这个分支叫主分支,即master分支。HEAD严格来说不是指向提交,而是指向master,master才是指向提交的,所以,HEAD指向的就是当前分支。
When the <commit> argument is a branch name, the--detachoption can be used to detach HEAD at the tip of the branch (git checkout <branch>would check out that branch without detaching HEAD). Omitting <branch> detaches HEAD at the tip of the current branch. ...
In its simplest (and most common) form, only the name of an existing local branch is specified: $ git checkout other-branch This will make the given branch the new HEAD branch. If, in one go, you also want to create a new local branch, you can use the "-b" parameter: ...
git checkout -b<new-branch> <existing-branch> By default git checkout -b will base the new-branch off the current HEAD. An optional additional branch parameter can be passed to git checkout. In the above example, <existing-branch> is passed which then bases new-branch off of existing-...
When the <commit> argument is a branch name, the--detachoption can be used to detach HEAD at the tip of the branch (git checkout <branch>would check out that branch without detaching HEAD). Omitting <branch> detaches HEAD at the tip of the current branch. ...