1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
| cfm@cfm880:uStarLink$ git revert 3184dd9b7b46de021c257e015ec3b007845e3f7f
cfm@cfm880:uStarLink$ git diff 4f667f93384885706cc1eea5385c54208fc3535e
cfm@cfm880:uStarLink$ git push origin master
Username for 'https://git.oschina.net': CFM880
Password for 'https://CFM880@git.oschina.net':
To https://git.oschina.net/CFM880/uStarLink.git
! [rejected] master -> master (non-fast-forward)
error: 无法推送一些引用到 'https://git.oschina.net/CFM880/uStarLink.git'
提示：更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。
提示：再次推送前，先与远程变更合并（如 'git pull ...'）。详见
提示：'git push --help' 中的 'Note about fast-forwards' 小节。
cfm@cfm880:uStarLink$ git pull origin master
cfm@cfm880:uStarLink$ git push -u origin master
Username for 'https://git.oschina.net': CFM880
Password for 'https://CFM880@git.oschina.net':
Counting objects: 33, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (15/15), 1.32 KiB | 0 bytes/s, done.
Total 15 (delta 10), reused 0 (delta 0)
To https://git.oschina.net/CFM880/uStarLink.git
40c7c93..56b7731 master -> master
分支 master 设置为跟踪来自 origin 的远程分支 master。
|