git merge origin master`和`git merge origin / master`有什么区别吗？ [英] Is there any difference between `git merge origin master` and `git merge origin/master`?

问题描述

任何人都可以解释 git merge origin master 和 git merge origin / master ？

我偶然做了 git merge origin master 。如果它不同，那么重置该合并的命令是什么？

解决方案

在测试之后， $ git merge origin master equals $ git merge origin / HEAD master 。

将两个分支（origin / HEAD，master）合并到当前分支中，这与 $ git merge origin / master 不同。

$ b $但是，通常情况下，master分支和origin / HEAD在同一个提交行中，所以这两个命令执行相同的操作。

我尝试了这种情况其中master和origin / HEAD分歧，结果如下所示，使用 $ git merge origin master ：

  *  - 。 33f82cd（HEAD，test）合并
 | \\ 
 | | * 46d0c92（主）22 
 | * | 9d9f51c（原产地/测试，产地/ HEAD）11 
 | | / 
 * | 5ecfebd（origin / master）modify 2.txt 
 | / 
 * 14949b6 remove 1.txt 
  

Can any body explain the difference between git merge origin master and git merge origin/master?

I did accidentally did git merge origin master. If it is different, what is the command to reset that merge?

解决方案

After my test, $git merge origin master equals $git merge origin/HEAD master.

This means merge two branch (origin/HEAD, master) into current branch, which is very different from $git merge origin/master.

But as usually, master branch and origin/HEAD is in the same commit line, so these two command performs the same.

And I try the case in which master and origin/HEAD diverged, the result shown as the following with $git merge origin master:

*-.   33f82cd (HEAD, test) merge
|\ \  
| | * 46d0c92 (master) 22
| * | 9d9f51c (origin/test, origin/HEAD) 11
| |/  
* | 5ecfebd (origin/master) modify 2.txt
|/  
* 14949b6 remove 1.txt

这篇关于git merge origin master`和`git merge origin / master`有什么区别吗？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！