Question

我想了解 git 的工作原理。所以我初始化了一个空的repo并在其中添加了一个文件，如下所示。

cd /home/adnan/workspace
mkdir git-test
cd git-test
git init
touch README
git add .
git commit -m "initial commit"

现在我使用以下命令序列克隆了这个仓库

cd /home/adnan/Desktop
git clone /home/adnan/workspace/git-test

之后我对README文件进行了更改，提交了它们并使用以下命令将它们推送到第一个repo

cd /home/adnan/Desktop/git-test
vi README
git commit -a -m "second commit"
git push

现在在两个repos中运行 git log 表示同样的事情，即

提交   cdf192f7e26e734c7a56cc830ade2e2d13c6fb0d   作者：Adnan Waheed    日期：
  Tue Mar 1 14:05:12 2011 +0500
second commit
提交   f8b75838e728e46cae949f66ff86d29c0864d976   作者：Adnan Waheed    日期：
  Tue Mar 1 14:03:23 2011 +0500
initial commit

但是我无法弄清楚如何在原始仓库中获得更改，即 / home / adnan / workspace / git-test 。如果我尝试 git checkout ，我收到此消息：

M   README

如何获取我在克隆仓库中所做的更改并推送？

Answer 1

您git push时是否看到错误消息？这样的事情（假设git＆gt; 1.7.0）？

$ git push
Counting objects: 5, done.
Writing objects: 100% (3/3), 246 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error: 
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error: 
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To /home/pfarmer/git-test/git-test
 ! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '/home/pfarmer/git-test/git-test'

基本上默认情况下，您无法推送到非裸存储库。但你可以做的是git pull，所以试试：

cd /home/adnan/workspace/git-test
git pull /home/adnan/Desktop/git-test

你应该看到类似的东西：

$ git pull ../git-test2/
From ../git-test2
 * branch            HEAD       -> FETCH_HEAD
Updating 161aeea..c66b221
Fast-forward
 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

如何在以下场景中获得更改？

1 个答案: