git-smart-update SKILL.md skillA
git-smart-update from nicholyx/ai-skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add nicholyx/ai-skills/git-smart-update@git:20260928.d37ee90Pins git:20260928.d37ee90 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- nicholyx/ai-skills
- Path
custom/daily/git-smart-update/SKILL.md- Versions recorded
- 2
- Latest version
- git:20260928.d37ee90, committed Sep 28, 2026
- First version recorded
- May 16, 2026
- Size
- 12,369 bytes
- Repository stars
- 6
- License
- Apache-2.0
智能 Git 更新工具，支持自动暂存、冲突解决和本地提交处理。当用户说"更新代码"、"拉取最新代码"、"git pull"、"更新当前分支"、"更新所有分支"、"保留本地修改并更新"时触发。自动处理 stash-update-restore 循环，智能解决冲突（优先采用远程改进，同时保留本地调试代码），支持 rebase 和 merge 两种模式。.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# Git 智能更新
智能更新 Git 仓库，同时保留本地修改。自动处理暂存-更新-还原循环，并智能解决合并冲突。
## 使用场景
当出现以下情况时使用此技能：
- 用户想更新/拉取代码，且有本地未提交的修改
- 用户说"更新代码"、"拉取最新"、"git pull 并保留我的修改"
- 用户提到更新分支（当前分支或所有分支）
- 你在 pull 操作前检测到未提交的修改
- 本地有已提交的代码，需要与远程同步
## 核心工作流程
### 步骤 1：分析当前状态
首先，了解当前的工作状态：
```bash
# 检查当前分支
git branch --show-current
# 检查未提交的本地修改
git status --porcelain
# 检查是否有 upstream 分支
git rev-parse --abbrev-ref --symbolic-full-name @{u}
# 检查本地是否有已提交但未推送的 commit
git log @{u}..HEAD --oneline
```
**判断点：**
- 无本地修改 → 直接进入更新流程
- 有未提交修改 → 进入暂存工作流
- 有本地 commit → 询问 rebase 还是 merge
- 无 upstream 分支 → 警告用户，询问处理方式
### 步骤 2：处理本地 Commit（如果存在）
检查本地是否有未推送的提交：
```bash
# 获取本地领先的 commit 数量
LOCAL_COMMITS=$(git log @{u}..HEAD --oneline | wc -l)
```
**如果有本地 commit（LOCAL_COMMITS > 0）：**
询问用户选择合并策略：
```
检测到你有 {N} 个本地提交尚未推送到远程。
你希望如何与远程更新合并？
1. **Rebase（变基）** - 推荐
✓ 提交历史更清晰线性
✓ 避免不必要的合并提交
⚠️ 会重写本地提交历史
2. **Merge（合并）**
✓ 保留原始提交历史
✓ 更安全的合并方式
⚠️ 会产生一个合并提交
请选择：rebase / merge
```
记录用户选择（`use_rebase`），用于后续的 pull 操作。
### 步骤 3：暂存本地修改（如果需要）
如果有未提交的本地修改：
```bash
git stash push -m "更新前自动暂存 - $(date '+%Y-%m-%d %H:%M:%S')"
```
记录 stash hash 以便后续验证。
### 步骤 4：获取远程更新
**重要：无论更新当前分支还是所有分支，都先 fetch 所有远程信息**
```bash
…Read the whole file at its exact version.
How to install
mdr add nicholyx/ai-skills/git-smart-update@sha256:4cca273c9a5d10bbThe line at the top of this page pins the label git:20260928.d37ee90, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_eaveuttpqgkd2rkf)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 2 versions of this file, between May 16, 2026 and Sep 28, 2026, about one every 135 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260928.d37ee90 latest | 2026-09-28 | d37ee90 | 12,369 B | A | view · diff |
| git:20260516.c68a9b7 | 2026-05-16 | c68a9b7 | 12,226 B | A | view |
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (12369 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
nicholyx/ai-skills · 6 stars · license Apache-2.0 · pushed 2026-10-18 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_eaveuttpqgkd2rkf GET https://markdownregistry.com/api/v1/resolve?ref=nicholyx/ai-skills/git-smart-update GET https://markdownregistry.com/api/v1/blob/4cca273c9a5d10bb0691e849d55d127e0b6b0a85c3178711d991f2fc7efffa77
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.