我從任意回購(未在.git/config中進行跟蹤)獲取。取回之後,git log
或gitk
中不會出現任何新內容。我拉後如何合併?如何從任意獲取進行合併?
/home/alice $ touch b && git add b && git commit -m "Added b"
[master dd8d3ba] Added b
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 b
/home/alice $ cd ../bob
/home/bob $ git fetch ../alice/
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (2/2), done.
From ../alice
* branch HEAD -> FETCH_HEAD
/home/bob $ ... now what?
我通過了什麼樣的論據到git merge
?
你試過'git合併FETCH_HEAD'嗎? – svick 2011-05-27 20:00:04
@svick - 應該是答案,而不是評論。我正在關注Git Book,並且還沒有在那裏找到這個命令。 – ripper234 2011-05-27 20:03:42