git pull 提示当前不在某个分支上解决办法
2024-05-14 02:21:48
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/ledeba8a697b..cc2ddb22 master -> origin/master
您当前不在一个分支上。
请指定您要合并哪一个分支。
详见 git-pull(1)。git pull <远程> <分支>解决办法
先查看分支情况：
leeysan@debiandaniel:~/lede$ git branch -amasterremotes/origin/HEAD -> origin/masterremotes/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-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/rb_hardconfig.ccreate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.ccreate mode 100644 target/linux/generic/files/drivers/platform/mikrotik/routerboot.ccreate 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.patchgit pull 提示当前不在某个分支上解决办法相关推荐
- 删除本地文件后 Git pull从远程仓库重新获取不到解决办法
删除本地文件后,想从远程仓库中重新新Pull最新代码,但是执行了git pull命令后始终无法拉取下来 提示 Already up-to-date. 原因:当前本地库处于另一个分支中,需将本分支发He ...
- git pull 默认拉取远端其他分支 问题解决
git pull 默认拉取远端其他分支 问题解决 参考文章: (1)git pull 默认拉取远端其他分支 问题解决 (2)https://www.cnblogs.com/starfish29/p/1 ...
- git commit 出现异常git did not exit cleanly (exit code 128)的解决办法
点击commit 后提示异常原因为"....file index.lock already exist......git did not exit cleanly (exit code 12 ...
- git warning: LF will be replaced by CRLF in 解决办法 1
git warning: LF will be replaced by CRLF in 解决办法 按照这样设置就没有问题了: git config core.autocrlf false 这样设置gi ...
- win8 远程桌面时提示凭证不工作问题的终极解决办法
原文 win8 远程桌面时提示凭证不工作问题的终极解决办法 环境说明 远程办公电脑(放置于公司.自用办公电脑.win8系统) 远程连接客户机(放置于家中.家庭日常所用.win8系统) 故障现象 最近在 ...
- 运行js提示库没有注册错误8002801d的解决办法
运行js提示库没有注册错误8002801d的解决办法 这个错误主要是因为服务器上的windows scripts版本较低,请按下面的链接下载较高版本windows scripts 5.6并在服务器上进 ...
- win10弹出计算机的内存不足,win10提示计算机显卡内存不足情况的解决办法介绍...
近日,有网友反映,windows10系统在内存充足的情况下,出现提示计算机的内存不足的对话框现象,那么,提示win10计算机内存不足是什么原因?如何解决?针对此问题,本文就为大家进行解答.有兴趣的朋友 ...
- CentOS 7 ping不通提示“Name or service not kown“的解决办法
CentOS 7 ping不通提示"Name or service not kown"的解决办法 一.问题环境 二.查看系统ip地址 二.查看VMware网络连接 四.查看虚拟机的 ...
- 本地计算机无法启动wireless,win7系统使用无线时提示：“windows无法启动wireless”的解决办法...
此文约为506字,阅读需要3分钟 如果在连接无线网络时连接不上,而系统提示了"Windows无法启动Wireless PAN DHCP Server服务(位于本地计算机上).错误1067:进 ...
- 占书明：outlook发邮件时提示“出现意外错误”的原因及解决办法！
占书明:outlook发邮件时提示"出现意外错误"的原因及解决办法! 有个使用者,在发送邮件时截了个图给我,如下"出现意外错误",便无法发送邮件: 使用环境:w ...
最新文章
- C++ 动态线性表的顺序存储结构（数组实现）
- oracle数据导入sqlldr小例子
- java 文本排序_如何使用Java按最高编号对文本文件进行排序
- 我的爹，我的娘(2006-02-22 21:39:07)（新浪）
- 她穿着由自己17封拒稿信做成的裙子，通过了博士论文答辩！
- 使用 webstorm 写 typescript 的一些小技巧
- python井字棋ai_[Python100行系列]-井字棋游戏
- 第14讲 转换与比较指令
- Scala 隐式转换和隐式参数
- List遍历的三种方式
- 计算两个时间之间的进度百分比
- transition 属性
- the old reader使用分享
- 电力电子相关论文英文单词积累
- 【情报热点】扒一扒FFIE做空报告中的调查方法和数据源……
- 知到大学生心理健康第二章单元测试
- php调扫描仪,扫描仪使用技巧
- 新品周刊 | 内外、UR、迪士尼商店、Kipling、资生堂、林清轩等女王节新品发布...
- python+selenium+webdriver 截取全页面长图
- 2021-01-12 PMP 群内练习题 - 光环