github-starred/ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-05-07 16:40:08 -05:00
Code Issues 14.5k Packages Projects Releases 120 Wiki Activity

[PR #6833] [MERGED] make patches git am-able #12236

New Issue
Closed
opened 2026-04-12 23:52:39 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-12 23:52:39 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/6833
Author: @mxyng
Created: 9/16/2024
Status: ✅ Merged
Merged: 9/17/2024
Merged by: @mxyng

Base: main ← Head: mxyng/git-am

📝 Commits (1)

📊 Changes

10 files changed (+130 additions, -55 deletions)

View changed files

📝 llm/generate/gen_common.sh (+4 -16)
📝 llm/generate/gen_windows.ps1 (+2 -22)
➕ llm/patches/0000-cmakelist.patch (+22 -0)
📝 llm/patches/0001-load-progress.patch (+17 -4)
📝 llm/patches/0002-clip-log.patch (+13 -1)
📝 llm/patches/0003-load_exception.patch (+15 -3)
📝 llm/patches/0004-metal.patch (+14 -2)
📝 llm/patches/0005-default-pretokenizer.patch (+13 -1)
📝 llm/patches/0006-embeddings.patch (+15 -3)
📝 llm/patches/0007-clip-unicode.patch (+15 -3)

📄 Description

raw diffs are git apply-able but not git am-able. git patches, e.g. through git format-patch, are both git apply-able and git am-able.

git am-able patches is very useful because changes can made incrementally and exported with git format-patch. this makes developing patches much easier since each iteration doesn't require regenerating the full diff. it also allows patches to be develop in the order they're applied.

checking out patched files is unnecessary since the submodule is reset (update -f) before patches are applied

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/6833 **Author:** [@mxyng](https://github.com/mxyng) **Created:** 9/16/2024 **Status:** ✅ Merged **Merged:** 9/17/2024 **Merged by:** [@mxyng](https://github.com/mxyng) **Base:** `main` ← **Head:** `mxyng/git-am` --- ### 📝 Commits (1) - [`7bd7b02`](https://github.com/ollama/ollama/commit/7bd7b02712beeedad23a95b29c1faf6137f57487) make patches git am-able ### 📊 Changes **10 files changed** (+130 additions, -55 deletions) <details> <summary>View changed files</summary> 📝 `llm/generate/gen_common.sh` (+4 -16) 📝 `llm/generate/gen_windows.ps1` (+2 -22) ➕ `llm/patches/0000-cmakelist.patch` (+22 -0) 📝 `llm/patches/0001-load-progress.patch` (+17 -4) 📝 `llm/patches/0002-clip-log.patch` (+13 -1) 📝 `llm/patches/0003-load_exception.patch` (+15 -3) 📝 `llm/patches/0004-metal.patch` (+14 -2) 📝 `llm/patches/0005-default-pretokenizer.patch` (+13 -1) 📝 `llm/patches/0006-embeddings.patch` (+15 -3) 📝 `llm/patches/0007-clip-unicode.patch` (+15 -3) </details> ### 📄 Description raw diffs are `git apply`-able but not `git am`-able. git patches, e.g. through `git format-patch`, are both `git apply`-able and `git am`-able. `git am`-able patches is very useful because changes can made incrementally and exported with `git format-patch`. this makes developing patches much easier since each iteration doesn't require regenerating the full diff. it also allows patches to be develop in the order they're applied. checking out patched files is unnecessary since the submodule is reset (`update -f`) before patches are applied --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-12 23:52:39 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
cloud
compatibility
context-length
create
docker
documentation
embeddings
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
image
install
intel
js
launch
linux
macos
memory
mlx
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
vulkan
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#12236
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?