“git rebase origin”与“git rebase origin / master” [英] "git rebase origin" vs."git rebase origin/master"

问题描述

我没有得到 git rebase origin 和 git rebase origin / master 之间的区别。在我的情况下，我克隆了一个git仓库两次。在第一个克隆中，我必须使用 git rebase origin ，而在另一个克隆中，我必须使用 git rebase origin / master 。

一个例子： http://paste.dennis-boldt.de/2011/05/11/git-rebase

解决方案

<这是一个更好的选择：

  git remote set-head -a原点
  
 
 
 
从文档：
 
 
 
 
使用-a，远程被查询以确定它的HEAD，然后$ GIT_DIR / remotes // HEAD被设置为相同的分支。例如，如果远程HEAD指向下一个，则git remote set-head origin -a将把$ GIT_DIR / refs / remotes / origin / HEAD设置为refs / remotes / origin / next。这只有在refs / remotes / origin / next已经存在时才有效;如果不是，它必须首先被提取。
 
 
这实际上已经有一段时间了（自v1.6.3开始）;不知道我错过了它！
 
I don't get the difference between git rebase origin and git rebase origin/master. In my case I cloned a git repository twice. In the first clone I have to use git rebase origin and in the other clone I must use git rebase origin/master.

An example: http://paste.dennis-boldt.de/2011/05/11/git-rebase
解决方案
Here's a better option:
git remote set-head -a origin
From the documentation:

  
With -a, the remote is queried to determine its HEAD, then $GIT_DIR/remotes//HEAD is set to the same branch. e.g., if the remote HEAD is pointed at next, "git remote set-head origin -a" will set $GIT_DIR/refs/remotes/origin/HEAD to refs/remotes/origin/next. This will only work if refs/remotes/origin/next already exists; if not it must be fetched first.
This has actually been around quite a while (since v1.6.3); not sure how I missed it!

                        
这篇关于“git rebase origin”与“git rebase origin / master”的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！