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 个本地对象.来自 /coolsnowwolf/ledeba8a697b..cc2ddb22 master-> origin/master您当前不在一个分支上。请指定您要合并哪一个分支。详见 git-pull(1)。git pull <远程> <分支>
解决办法
先查看分支情况：
leeysan@debiandaniel:~/lede$ git branch -amasterremotes/origin/HEAD -> origin/masterremotes/origin/master* （头指针分离于 ）
输入命令解决：
sudo git checkout mastersudo git pull
搞定。我的情况如下：
leeysan@debiandaniel:~/lede$ sudo git checkout master已经位于 'master'您的分支落后 'origin/master' 共 102 个提交，并且可以快进。（使用 "git pull" 来更新您的本地分支）leeysan@debiandaniel:~/lede$ sudo git pull更新 ba8a697b..cc2ddb22Fast-forwardconfig/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 | 72 +-package/lean/default-settings/i18n/sqm.zh-cn.po | 106 +-package/lean/fast-classifier/Makefile | 91 +package/lean/fast-classifier/src/Makefile | 10 +package/lean/{shortcut-fe => fast-classifier}/src/fast-classifier.c | 421 ++--package/lean/{shortcut-fe => fast-classifier}/src/fast-classifier.h | 0package/lean/{shortcut-fe => fast-classifier}/src/nl_classifier_test.c| 0package/lean/{shortcut-fe => fast-classifier}/src/userspace_example.c| 2 +-package/lean/gmediarender/Makefile | 50 +package/lean/ksmbd-tools/Makefile | 8 +-package/lean/ksmbd-tools/files/ksmbd.config | 8 +-package/lean/ksmbd/Makefile | 6 +-package/lean/ksmbd/patches/01-keep_kmod_metadata.patch | 5 +-package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po | 23 +-package/lean/luci-app-cifsd/Makefile | 2 +-package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua| 2 +-package/lean/luci-app-cifsd/luasrc/model/cbi/cifsd.lua | 13 +-package/lean/luci-app-cifsd/po/zh-cn/cifsd.po| 16 +-package/lean/luci-app-cpufreq/po/zh-cn/cpufreq.po| 18 +-package/lean/luci-app-filetransfer/po/zh-cn/filetransfer.po| 16 +-package/lean/luci-app-flowoffload/Makefile | 4 +-package/lean/luci-app-frps/root/usr/share/rpcd/acl.d/luci-app-frps.json | 11 +package/lean/luci-app-kodexplorer/po/zh-cn/kodexplorer.po | 21 +-package/lean/luci-app-music-remote-center/po/zh-cn/forked-daapd.po | 10 +-package/lean/luci-app-nft-qos/po/zh-cn/nft-qos.po| 8 +-package/lean/luci-app-pppoe-relay/po/zh-cn/pppoe-relay.po | 17 +-package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po | 1152 +++++-----package/lean/luci-app-rclone/po/{zh_Hans => zh-cn}/luci-app-rclone.po| 10 +-package/lean/luci-app-rclone/po/zh-cn/rclone.po | 1 -package/lean/luci-app-samba4/po/zh-cn/samba4.po | 12 +-package/lean/luci-app-sfe/Makefile | 4 +-package/lean/luci-app-unblockmusic/Makefile | 2 +-package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic | 3 +-package/lean/luci-app-vsftpd/po/zh-cn/vsftpd.po | 15 +-package/lean/luci-app-webadmin/po/zh-cn/webadmin.po | 11 +-package/lean/luci-theme-netgear/luasrc/view/themes/netgear/header.htm| 2 +-package/lean/mt/drivers/mt_wifi/files/firmware.sh| 2 +-package/lean/npc/Makefile| 4 +-package/lean/r8125/Makefile | 2 +-package/lean/r8125/src/Makefile | 6 +-package/lean/r8125/src/r8125.h| 74 +-package/lean/r8125/src/r8125_dash.h| 14 +-package/lean/r8125/src/r8125_n.c | 3876 +++++++++++++++++++++++++---------package/lean/r8125/src/r8125_realwow.h | 2 +-package/lean/r8125/src/rtl_eeprom.c| 117 +-package/lean/r8125/src/rtl_eeprom.h| 19 +-package/lean/r8125/src/rtltool.c | 14 +-package/lean/r8125/src/rtltool.h | 2 +-package/lean/r8168/Makefile | 1 -package/lean/redsocks2/Makefile | 6 +-package/lean/shortcut-fe/Makefile | 86 +-package/lean/shortcut-fe/files/etc/init.d/shortcut-fe | 48 +package/lean/shortcut-fe/files/usr/bin/sfe_dump | 35 +package/lean/shortcut-fe/src/Makefile | 11 +-package/lean/shortcut-fe/src/README| 122 --package/lean/shortcut-fe/src/sfe.h | 99 +-package/lean/shortcut-fe/src/sfe_backport.h | 61 +-package/lean/shortcut-fe/src/sfe_cm.c | 184 +-package/lean/shortcut-fe/src/sfe_cm.h | 39 +-package/lean/shortcut-fe/src/sfe_ipv4.c| 286 ++-package/lean/shortcut-fe/src/sfe_ipv6.c| 277 ++-package/lean/v2ray-plugin/Makefile | 10 +-package/lean/v2ray/Config.in | 2 +-package/lean/v2ray/Makefile | 4 +-package/lean/wol/Makefile| 50 +package/network/services/wireguard/Makefile | 4 +-target/linux/ar71xx/Makefile | 2 +-.../bcm27xx/patches-4.19/950-0029-mm-Remove-the-PFN-busy-warning.patch| 2 +-.../950-0121-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch | 2 +-.../950-0574-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch | 2 +-.../backport-4.19/390-v5.1-sch_cake-Make-the-dual-modes-fairer.patch | 217 ++.../391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch| 118 ++.../392-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patch | 102 +.../393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch| 158 ++.../394-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch | 30 +...95-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patch | 170 ++.../396-5.8-sch_cake-don-t-try-to-reallocate-or-unshare-skb-unco.patch| 96 +.../397-5.8-sch_cake-don-t-call-diffserv-parsing-code-when-it-is.patch| 62 +.../generic/backport-4.19/398-5.8-sch_cake-fix-a-few-style-nits.patch| 40 +.../399-5.9-sch_cake-add-RFC-8622-LE-PHB-support-to-CAKE-diffser.patch| 57 +target/linux/generic/config-4.14 | 1 +target/linux/generic/config-4.19 | 1 +target/linux/generic/files/drivers/platform/mikrotik/Kconfig| 19 +target/linux/generic/files/drivers/platform/mikrotik/Makefile | 4 +target/linux/generic/files/drivers/platform/mikrotik/rb_hardconfig.c | 744 +++++++target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c | 754 +++++++target/linux/generic/files/drivers/platform/mikrotik/routerboot.c| 218 ++target/linux/generic/files/drivers/platform/mikrotik/routerboot.h| 37 +.../hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch| 236 +++.../641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch | 114 +.../hack-4.19/999-net-patch-linux-kernel-to-support-shortcut-fe.patch| 236 +++.../120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +-target/linux/ipq40xx/Makefile| 2 +-target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts | 40 +target/linux/ramips/dts/mt7621_xiaomi_mir4.dts | 173 ++target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts | 116 +-target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsi | 120 ++target/linux/ramips/image/mt7621.mk| 34 +-target/linux/ramips/mt7621/base-files/etc/board.d/01_leds | 3 +target/linux/ramips/mt7621/base-files/etc/board.d/02_network| 9 +-target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh | 2 +target/linux/x86/64/target.mk| 2 +-target/linux/x86/Makefile| 5 +-target/linux/x86/config-4.19 | 21 +-tools/squashfs/patches/140-gcc-10-fix.patch | 25 +tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch| 43 +123 files changed, 9195 insertions(+), 2601 deletions(-)create mode 100644 package/kernel/kmod-sched-cake-oot/Makefiledelete mode 100644 package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patchcreate mode 100644 package/lean/fast-classifier/Makefilecreate mode 100644 package/lean/fast-classifier/src/Makefilerename package/lean/{shortcut-fe => fast-classifier}/src/fast-classifier.c (83%)rename package/lean/{shortcut-fe => fast-classifier}/src/fast-classifier.h (100%)rename package/lean/{shortcut-fe => fast-classifier}/src/nl_classifier_test.c (100%)rename package/lean/{shortcut-fe => fast-classifier}/src/userspace_example.c (99%)create mode 100644 package/lean/gmediarender/Makefilecreate mode 100644 package/lean/luci-app-frps/root/usr/share/rpcd/acl.d/luci-app-frps.jsonrename package/lean/luci-app-rclone/po/{zh_Hans => zh-cn}/luci-app-rclone.po (95%)delete mode 120000 package/lean/luci-app-rclone/po/zh-cn/rclone.pocreate mode 100755 package/lean/shortcut-fe/files/etc/init.d/shortcut-fecreate mode 100644 package/lean/shortcut-fe/files/usr/bin/sfe_dumpdelete mode 100644 package/lean/shortcut-fe/src/READMEcreate mode 100644 package/lean/wol/Makefilecreate mode 100644 target/linux/generic/backport-4.19/390-v5.1-sch_cake-Make-the-dual-modes-fairer.patchcreate mode 100644 target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patchcreate mode 100644 target/linux/generic/backport-4.19/392-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patchcreate mode 100644 target/linux/generic/backport-4.19/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patchcreate mode 100644 target/linux/generic/backport-4.19/394-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patchcreate mode 100644 target/linux/generic/backport-4.19/395-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patchcreate mode 100644 target/linux/generic/backport-4.19/396-5.8-sch_cake-don-t-try-to-reallocate-or-unshare-skb-unco.patchcreate mode 100644 target/linux/generic/backport-4.19/397-5.8-sch_cake-don-t-call-diffserv-parsing-code-when-it-is.patchcreate mode 100644 target/linux/generic/backport-4.19/398-5.8-sch_cake-fix-a-few-style-nits.patchcreate mode 100644 target/linux/generic/backport-4.19/399-5.9-sch_cake-add-RFC-8622-LE-PHB-support-to-CAKE-diffser.patchcreate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/Kconfigcreate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/Makefilecreate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/reate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/reate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/reate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/routerboot.hcreate mode 100644 target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patchcreate mode 100644 target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patchcreate mode 100644 target/linux/generic/hack-4.19/999-net-patch-linux-kernel-to-support-shortcut-fe.patchcreate mode 100644 target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dtscreate mode 100755 target/linux/ramips/dts/mt7621_xiaomi_mir4.dtscreate mode 100644 target/linux/ramips/dts/mt7621_xiaomi_router-ac2100.dtsicreate mode 100644 tools/squashfs/patches/140-gcc-10-fix.patchcreate mode 100644 tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch
