git staging并在多个分支之间提交

Question

我显然根本不懂git.这就是我得到的:

git branch  (outputs that I'm on master)
git checkout -b foo
echo "next line" >> file (file is an existing file)
git add file (stages)
git checkout master
git status (shows that file has "next line" and is staged!!)
git commit (commits the changes that were staged on branch foo!!)
git checkout foo

这是踢球者.foo现在不显示对工作目录中的文件所做的任何更改或暂存.

所以看起来 - 你所做的任何更改,包括修改文件和升级,都发生在所有分支上.当您COMMIT到特定分支时,除了您提交的分支之外的所有其他分支上将丢弃这些更改.

这实际上是怎么回事？有人能让这对我有意义吗？这听起来像是完全搞砸的行为,显然我没有得到使这个做事明智的设计理念.

编辑显式示例:

$ mkdir element
$ cd element
$ git init
Initialized empty Git repository in /home/dan/element/.git/
$ echo "one" >> one
$ git add one
$ git commit -m msg
[master (root-commit) 36dc8b0] msg
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 one
$ git checkout -b fire
Switched to a new branch 'fire'
$ echo "next line" >> one
$ git checkout master
M       one
Switched to branch 'master'
$ cat one
one
next line
$

这与git pro书明显矛盾:

This is an important point to remember: Git resets your working directory to look like the snapshot of the commit that the branch you check out points to. It adds, removes, and modifies files automatically to make sure your working copy is what the branch looked like on your last commit to it.

Answer 1

只有当您提交文件时,添加文件时您所在的分支并不重要.所以,如果你这样做:

git add file
git checkout master
git commit

您已将文件提交到主分支.

这是一个完整的例子,带有输出.我们从一个新的存储库开始:

$ git init
Initialized empty Git repository in /home/lars/tmp/so/repo/.git/

此时,我们在master分支机构,我们还没有添加任何文件.我们添加一个文件:

$ date > file1
$ cat file1
Fri May 11 13:05:59 EDT 2012
$ git add file1
$ git commit -m 'added a file'
[master (root-commit) b0764b9] added a file
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 file1

好的,我们现在有一个branch(master),一个提交.让我们创建新的分支:

$ git checkout -b foo
Switched to a new branch 'foo'
$ git branch
* foo
  master
$ ls
file1

现在我们将添加一行file1.

$ date >> file1
$ git status
# On branch foo
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   file1
#
no changes added to commit (use "git add" and/or "git commit -a")

这表明该文件已被修改,但尚未暂存.让我们暂存文件并提交它:

$ git add file1
$ git commit -m 'made a change'
[foo 761bed9] made a change
 1 files changed, 1 insertions(+), 0 deletions(-)

并重新运行git status:

$ git status
# On branch foo
nothing to commit (working directory clean)

此时,该文件如下所示:

Fri May 11 13:05:59 EDT 2012
Fri May 11 13:07:36 EDT 2012

如果我们切换回master分支,我们将看到没有第二行的文件的早期版本:

$ git checkout master
Switched to branch 'master'
$ cat file1
Fri May 11 13:05:59 EDT 2012

对文件的更改将与提交它们的分支隔离.

在您更新的示例中,这......

$ git checkout master

......不,因为此时产生一个错误,在两个"一"的版本master和fire是相同的.工作目录中的更改同样适用于任一版本.

Answer 2

暂存区又名索引对所有分支都是通用的，这解释了您的观察