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

[PR #6235] [MERGED] Set *.png and *.ico to be treated as binary files. #74353

New Issue
Closed
opened 2026-05-05 06:23:55 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-05 06:23:55 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/6235
Author: @Nicholas42
Created: 8/7/2024
Status: ✅ Merged
Merged: 8/10/2024
Merged by: @mxyng

Base: main ← Head: fix_line_endings

📝 Commits (3)

  • ce67706 Set *.png and *.ico to be treated as binary files.
  • 67472e0 Also flag *.icns as binary
  • d4e6407 Restrict text files with explicit line feeds to *.go.

📊 Changes

1 file changed (+2 additions, -1 deletions)

View changed files

📝 .gitattributes (+2 -1)

📄 Description

The change b732beba6 makes all files text files and sets lf as eol. This will automatically change all files to have lf if they are touched by git (e.g. via git status). This change cannot be stashed and makes it hard to work with the repo (rebase and checkout don't really work). See also #6183.

Here, we set the offending files (*.png and *.ico, but that might be more in the future) to be treated as binary files and not be changed by git.

🔄 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/6235 **Author:** [@Nicholas42](https://github.com/Nicholas42) **Created:** 8/7/2024 **Status:** ✅ Merged **Merged:** 8/10/2024 **Merged by:** [@mxyng](https://github.com/mxyng) **Base:** `main` ← **Head:** `fix_line_endings` --- ### 📝 Commits (3) - [`ce67706`](https://github.com/ollama/ollama/commit/ce67706037a2583157fcac4cbf6253fe0f1e5139) Set *.png and *.ico to be treated as binary files. - [`67472e0`](https://github.com/ollama/ollama/commit/67472e0e89f516ccfbfad2d11414aadf484b7642) Also flag *.icns as binary - [`d4e6407`](https://github.com/ollama/ollama/commit/d4e640746469ac586f12b400384c4ae7354d9280) Restrict text files with explicit line feeds to *.go. ### 📊 Changes **1 file changed** (+2 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `.gitattributes` (+2 -1) </details> ### 📄 Description The change b732beba6 makes all files text files and sets lf as eol. This will automatically change all files to have lf if they are touched by git (e.g. via git status). This change cannot be stashed and makes it hard to work with the repo (rebase and checkout don't really work). See also #6183. Here, we set the offending files (*.png and *.ico, but that might be more in the future) to be treated as binary files and not be changed by git. --- <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-05-05 06:23:56 -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#74353
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?