2016-01-13 44 views
1

我现在正在学习git,而我刚刚遇到了一个令人困惑的问题:我使用了两个相同的一系列命令,但结果显示不同。第一系列的命令是:两个相同的命令导致不同的响应git

lihangdeMacBook-Pro:learngit lihang$ git checkout -b dev 

Switched to a new branch 'dev' 

lihangdeMacBook-Pro:learngit lihang$ emacs readme.txt  //doing some editing 

lihangdeMacBook-Pro:learngit lihang$ git add readme.txt 

lihangdeMacBook-Pro:learngit lihang$ git commit -m "branch test" 

[dev 01d10cf] branch test 

1 file changed, 1 insertion(+) 

lihangdeMacBook-Pro:learngit lihang$ git checkout master 

Switched to branch 'master' 

Your branch is up-to-date with 'origin/master'. 

这里的最后一句表明“你的分支上最新与‘产地/主’”。 后来我删除Dev分支,并开始了一个名为功能1新的分支:

lihangdeMacBook-Pro:learngit lihang$ git checkout -b feature1 

Switched to a new branch 'feature1' 

lihangdeMacBook-Pro:learngit lihang$ emacs readme.txt  //doing some editing 

lihangdeMacBook-Pro:learngit lihang$ git add readme.txt 

lihangdeMacBook-Pro:learngit lihang$ git commit -m "AND simple" 

[feature1 4ad475a] AND simple 

1 file changed, 1 insertion(+), 1 deletion(-) 

lihangdeMacBook-Pro:learngit lihang$ git checkout master 

Switched to branch 'master' 
Your branch is ahead of 'origin/master' by 1 commit. 
    (use "git push" to publish your local commits) 

两个系列的命令是相同的,但为什么这两个命令的最后一句话显示了不同的结果?

回答

0

每条语句结尾处的输出行Your branch is与您显示的命令无关(它只是提供关于刚切换到的分支的状态的上下文)。它暗示的是,在第二组命令之前,你做了一些更新master的事情,但是你没有将这些更改推送到origin

+0

谢谢!看起来主人不同于出身......呃......我会弄清楚这一点。 – LeonloveKaren

相关问题