leeysan@debiandaniel:~/lede$ sudo git pull
[sudo] leeysan 的密码:
remote: Enumerating objects: 469, done.
remote: Counting objects: 100% (469/469), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 767 (delta 467), reused 468 (delta 467), pack-reused 298
接收对象中: 100% (767/767), 220.14 KiB | 43.00 KiB/s, 完成.
处理 delta 中: 100% (491/491), 完成 167 个本地对象.
来自 https://github.com/coolsnowwolf/lede
ba8a697b..cc2ddb22 master -> origin/master
您当前不在一个分支上。
请指定您要合并哪一个分支。
详见 git-pull(1)。
git pull <远程> <分支>
解决办法
先查看分支情况:
leeysan@debiandaniel:~/lede$ git branch -a
master
remotes/origin/HEAD -> origin/master
remotes/origin/master
* (头指针分离于 20200416)
输入命令解决:
sudo git checkout master
sudo git pull
搞定。我的情况如下:
leeysan@debiandaniel:~/lede$ sudo git checkout master
已经位于 'master'
您的分支落后 'origin/master' 共 102 个提交,并且可以快进。
(使用 "git pull" 来更新您的本地分支)
leeysan@debiandaniel:~/lede$ sudo git pull
更新 ba8a697b..cc2ddb22
Fast-forward
config/Config-images.in | 5 +-
include/image.mk | 2 +-
include/kernel-version.mk | 8 +-
include/prereq-build.mk | 16 +-
package/boot/uboot-envtools/files/ramips | 2 +
package/firmware/linux-firmware/Makefile | 4 +-
package/firmware/linux-firmware/intel.mk | 6 +-
package/kernel/kmod-sched-cake-oot/Makefile | 54 +
package/kernel/kmod-sched-cake/Makefile | 2 +-
package/kernel/linux/modules/fs.mk | 24 +
package/kernel/linux/modules/video.mk | 1 +
package/lean/UnblockNeteaseMusicGo/Makefile | 19 +-
package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch | 13 -
package/lean/automount/Makefile | 4 +-
package/lean/baidupcs-web/Makefile | 4 +-
package/lean/default-settings/Makefile | 2 +-
package/lean/default-settings/files/zzz-default-settings | 2 +-
package/lean/default-settings/i18n/more.zh-cn.po