在一个分支上开发了很长一段时间后,我切换到了master。日志显示:
你的分支比“origin/master”慢了167次提交,并且可以快进。
我试着:
git checkout HEAD
它没有任何效果。这是因为我在master上签出了一个中间提交。
我怎样才能使主人保持头脑清醒?
在一个分支上开发了很长一段时间后,我切换到了master。日志显示:
你的分支比“origin/master”慢了167次提交,并且可以快进。
我试着:
git checkout HEAD
它没有任何效果。这是因为我在master上签出了一个中间提交。
我怎样才能使主人保持头脑清醒?
当前回答
在你的情况下,git rebase也会奏效。因为你没有master没有的更改,git会快进。如果你正在使用一个rebase工作流,这可能是更可取的,因为如果你搞砸了,你就不会以合并提交告终。
username@workstation:~/work$ git status
# On branch master
# Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
# (use "git pull" to update your local branch)
#
nothing to commit, working directory clean
username@workstation:~/work$ git rebase
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/origin/master.
# On branch master
nothing to commit, working directory clean
其他回答
尝试git合并origin/master。如果你想确保它只做快进,你可以说git merge——ff-only origin/master。
在我的方式,它返回所有改变的头,是最快的方式:
git fetch origin master
git reset --hard FETCH_HEAD
git clean -df
git checkout master
git pull
应该做这份工作。
每次当你在不同于master的分支上工作时,你都会得到“你的分支落后”消息,有人对master进行了更改,而你git拉。
(branch) $ //hack hack hack, while someone push the changes to origin/master
(branch) $ git pull
现在,源/主引用被拉出,但您的主引用没有与其合并
(branch) $ git checkout master
(master) $
现在master在origin/master后面,可以快速前进了
this will pull and merge (so merge also newer commits to origin/master)
(master) $ git pull
this will just merge what you have already pulled
(master) $ git merge origin/master
现在你的master和原点/master是同步的
如果你站在不同的分支上,想要签出master的最新版本,你也可以这样做
git checkout -B master origin/master
在你的例子中,要快进,运行:
$ git merge --ff-only origin/master
这使用了git merge的——ff-only选项,因为问题特别要求“快进”。
下面是git-merge(1)的一个节选,展示了更多的快进选项:
--ff, --no-ff, --ff-only
Specifies how a merge is handled when the merged-in history is already a descendant of the current history. --ff is the default unless merging an annotated
(and possibly signed) tag that is not stored in its natural place in the refs/tags/ hierarchy, in which case --no-ff is assumed.
With --ff, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When
not possible (when the merged-in history is not a descendant of the current history), create a merge commit.
With --no-ff, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward.
With --ff-only, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status.
我经常快进,以至于它需要一个别名:
$ git config --global alias.ff 'merge --ff-only @{upstream}'
现在我可以快进:
$ git ff