Skip to content

提供一份脚本,能够保留自己的配置 同时保持上游更新 #132

Description

@Ran-Xing

生成补丁

git diff upstream/main...main > ../自定义插件.patch

应用补丁

git apply ../自定义插件.patch --allow-empty

推送仓库(常用)

git checkout main # 拉取本地仓库最新状态
git fetch --no-tags upstream # 拉取远程仓库分支:upstream/main:https://github.com/ZqinKing/wrt_release.git
git diff upstream/main...main > ../自定义插件.patch #  远程仓库与当前修改完的对比
git reset --hard upstream/main # 重置为远程分支最新版本
git apply --3way ../自定义插件.patch # 将修改应用到本地
git commit -a -m "自定义插件" # 提交修改
git push -f # 强制推送

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions