在交互式中,update命令只会再次列出命令:
$ git add -i
staged unstaged path
1: +0/-3 nothing .bowerrc
2: +4/-1 nothing .meteor/packages
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now> u
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now> 2
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now> update
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now>
git version 2.2.1
根据
http://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging
我应该期待:
staged unstaged path
1: unchanged +0/-1 TODO
2: unchanged +1/-1 index.html
3: unchanged +5/-1 lib/simplegit.rb
Update>>
答案 0 :(得分:1)
你错过了一个重要的状态"您的仓库必须在update
命令执行任何操作。从doc示例中,您可以看到:
$ git add -i
staged unstaged path
1: unchanged +0/-1 TODO
2: unchanged +1/-1 index.html
3: unchanged +5/-1 lib/simplegit.rb
*** Commands ***
1: status 2: update 3: revert 4: add untracked
5: patch 6: diff 7: quit 8: help
What now>
但是你的州是:
$ ga -i
staged unstaged path
1: +0/-3 nothing .bowerrc
2: +4/-1 nothing .meteor/packages
区别在于您的暂存/未暂存列。 update
命令用于暂存新更改。由于没有任何未分级的任务,update
命令完成时没有提示。
答案 1 :(得分:0)
所有更改都已上演。一旦我使用git reset
取消暂存,它就能正常运行。