git merge 回退_Git命令

git branch                        //查看本地分支
git branch -r                    //查看远端分支
git branch -a                    //查看所有分支

git branch [branch name] //创建本地分支

git checkout [branch name]        //切换分支
git checkout -b [branch name]    //创建+切换分支，相当于git branch & git checkout

git push origin [branch name]

git branch -d [branch name]        //删除本地分支
git push origin :[branch name]    //删除远端分支，分支前面的冒号代表删除
 
 

git stash

git pull

git stash pop stash@{0}

git stash pop
 

git checkout --filename        //单个文件
 
git checkout .                //全部文件

rm filename / rm dir -rf    //单个文件 //直接删除文件
 
 
git clean -xdf                //全部文件
 
// 删除新增文件，如果文件已经git add到缓存区，并不会删除

git reset HEAD filename     //单个文件
git reset HEAD .            //全部文件

git reset commit_id            //commit_id是你回到的那个节点，可通过git log查看，可以只选前几位
 
//撤销之后，已经commit的修改还在工作区
 
git reset --hard commit_id
 
//撤销之后，已经commit的修改将会删除，仍在工作区/暂存区的代码不会清除
 

git log //查看要回退的commit_id
git branch the_branch_backup    //备份当前这个分支的情况
git reset --hard commit_id      //本地分支回滚到对应版本
git push origin :the_branch     //删除远端分支
git push origin the_branch      //用回滚后的本地分支建立远端分支

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.

F:镜像文件>git clone https://xxx/dc/vmware-image.git
Cloning into 'vmware-image'...
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.

F:镜像文件vmware-image>git lfs install
Updated git hooks.
Git LFS initialized.

F:镜像文件vmware-image>git lfs track "*.wim"
Tracking "*.wim"

F:镜像文件vmware-image>git add install.wim
Possibly malformed conversion on Windows, see `git lfs help smudge` for more det
ails.
 
F:镜像文件vmware-image>git commit -am "添加install.wim"
[master 43c28b8] 添加install.wim
 1 file changed, 3 insertions(+)
 create mode 100644 install.wim
 
F:镜像文件vmware-image>git push origin xxx
Locking support detected on remote "origin". Consider enabling it with:
  $ git config lfs.https://xxxx/dc/vmware-image.git/info/lfs.loc
ksverify true
Uploading LFS objects: 100% (1/1), 11 GB | 23 MB/s, done
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 407 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
remote:
remote: To create a merge request for xxx, visit:
remote:   https://xxx/dc/vmware-image/merge_requests/new?merge_
request%5Bsource_branch%5D=xxx
remote:
To https://xxx/dc/vmware-image.git
 * [new branch]      xxx -> xxx