# git-mediate を Homebrew, apt でインストール

git-mediate のインストール経路、実行ファイル、メタデータ、AI エージェント向けセキュリティノートを確認します。

## インストール

```sh
sudo av install brew:git-mediate
```

追加のインストールコマンド:

### macOS

- Homebrew (100%):

```sh
brew install git-mediate
```

  証拠: local Homebrew formula metadata

### Linux

- Debian apt (92%):

```sh
sudo apt install git-mediate
```

  証拠: Debian stable package indexes: git-mediate from https://deb.debian.org/debian/dists/stable/main/binary-amd64/Packages.xz

## パッケージ情報

- **パッケージキー:** brew:git-mediate
- **パッケージマネージャ:** Homebrew
- **パッケージマネージャページ:** <https://formulae.brew.sh/formula/git-mediate>
- **バージョン:** 1.1.0
- **ソース概要:** Utility to help resolve merge conflicts
- **ホームページ:** <https://github.com/Peaker/git-mediate>
- **リポジトリ:** <https://github.com/Peaker/git-mediate>
- **ライセンス:** GPL-2.0-only
- **ソースアーカイブ:** <https://github.com/Peaker/git-mediate/archive/refs/tags/1.1.0.tar.gz>
- **最終更新:** 2026-07-22T05:53:20Z
- **生成日時:** 2026-08-04T22:13:35+00:00

## 実行可能ファイル

- git-mediate (cli)
- git-mediate (エイリアス)

## 依存関係

- gmp

## ビルド依存関係

- cabal-install
- ghc

## macOS 提供ライブラリ

- libffi

## インストール挙動

- post-install フック: 未定義
- Bottle: 利用可能 対象 arm64_linux, arm64_sequoia, arm64_sonoma, arm64_tahoe, sonoma, x86_64_linux

## バージョンと鮮度

- ページ生成日: 2026-08-04
- マネージャ版: 1.1.0
- マネージャ更新日: 2026-07-22
- ローカルデータ: OK
- 上流リポジトリ: https://github.com/Peaker/git-mediate
- 検出された最新: 1.1.0 (最新)
## プロジェクトの歴史と使われ方

git-mediate is a Haskell Git helper for resolving merge conflicts that have become mechanically trivial. It is built around Git's diff3 and zdiff3 conflict styles, where the base version is visible alongside both sides of a conflict.

### プロジェクトの歴史

Eyal Lotem began the project in December 2014 under the name resolve-trivial-conflicts. The changelog records early work on conflict display, terminal color handling, modify/delete conflicts, add/add conflicts, and diff2 output.

In December 2016 the project was renamed to git-mediate, reached version 1.0, and received its first Hackage release. Later releases added Windows compatibility fixes, a `--merge-file` option, line-ending handling, nested-conflict parsing fixes, zdiff3 awareness, and editor improvements.

### 採用の歴史

git-mediate is a niche but well-sourced conflict-resolution utility. Its README lists installation through Homebrew, Debian packages, Arch's AUR, Haskell Stack, and source builds, while the changelog notes its Debian unstable entry in July 2023.

### 使われ方

Practitioners first configure Git to use diff3 or zdiff3 conflict style, then manually make simple changes across the conflict sections. Running `git-mediate` detects conflicts where one side can be selected or where markers have been removed, resolves what it can, and runs `git add` for files with all conflicts resolved.

The `-d` flag displays conflict diffs from the base, and `-e` opens an editor for conflicted files that cannot be resolved automatically. This makes the tool useful during manual conflict cleanup rather than as a full merge driver replacement.

### パッケージ好きにとっての重要性

git-mediate is package-nerd interesting because it embraces Git's existing conflict-marker formats instead of inventing a new merge UI. It is small, scriptable, and distributed through both Haskell and operating-system package channels.

### タイムライン

- 2014: Development started as resolve-trivial-conflicts.
- 2014: v0.2 added remaining-conflict display.
- 2016: Renamed to git-mediate and released on Hackage.
- 2023: Debian unstable packaging appeared.
- 2024: v1.1.0 added split-marker and line-added-around options.

### Related projects

- git-mediate relates to Git's merge conflict styles, especially diff3 and zdiff3. It complements visual merge tools and Git rerere by helping after a user has made a conflict simple enough to resolve mechanically.

### ソース

- <https://api.github.com/repos/Peaker/git-mediate>
- <https://formulae.brew.sh/formula/git-mediate>
- <https://github.com/Peaker/git-mediate#readme>
- <https://github.com/Peaker/git-mediate/blob/master/ChangeLog.md>
- <https://hackage.haskell.org/package/git-mediate>


## セキュリティノート

broad file, network, media, or database tool signal.

- **Geiger リスク:** blue / 中
- broad file, network, media, or database tool signal

## ソースデータベース詳細

- **Source Database:** Homebrew formula API
- **Tap:** homebrew/core
- **Full Name:** git-mediate
- **Version Scheme:** 0
- **Revision:** 0
- **Bottle Stable Root URL:** <https://ghcr.io/v2/homebrew/core>
- **Deprecated:** no
- **Disabled:** no
- **Keg Only:** no
- **URL Keys:** stable

## 他のパッケージマネージャ記録

- Debian apt - git-mediate - 1.0.9-1: normalized package name match | Debian stable package indexes: git-mediate from https://deb.debian.org/debian/dists/stable/main/binary-amd64/Packages.xz | tool to help resolving git conflicts | https://github.com/Peaker/git-mediate
- Ubuntu apt - git-mediate - 1.0.9-1: normalized package name match | Ubuntu 24.04 LTS package indexes: git-mediate from https://archive.ubuntu.com/ubuntu/dists/noble/universe/binary-amd64/Packages.gz | tool to help resolving git conflicts | https://github.com/Peaker/git-mediate


## 関連リンク

- [Source-control packages](https://pkg.so/ja/source-control-tools/) - Belongs to a source-control command family.
- [Secret-risk packages](https://pkg.so/ja/secret-risk-packages/) - Has protected-tool coverage, approval-gate, or non-low Geiger security signals.
- [Terminal utility packages](https://pkg.so/ja/terminal-utilities/) - Matched terminal and command-line workflow metadata.
- [Text processing packages](https://pkg.so/ja/text-processing-tools/) - Matched text, document, or structured-data processing metadata.
- [cabal-install](https://pkg.so/ja/brew/cabal-install/) - Build dependency declared by Homebrew.
- [ghc](https://pkg.so/ja/brew/ghc/) - Build dependency declared by Homebrew.
- [git-octopus](https://pkg.so/ja/brew/git-octopus/) - Shares pkgdb curated category or tags: cli, conflict-resolution, developer-tools, git, git-extension.
- [git-lfs](https://pkg.so/ja/brew/git-lfs/) - Shares pkgdb curated category or tags: cli, developer-tools, git, git-extension.
- [git-machete](https://pkg.so/ja/brew/git-machete/) - Shares pkgdb curated category or tags: cli, developer-tools, git, git-extension.
- [weave](https://pkg.so/ja/brew/weave/) - Shares pkgdb curated category or tags: cli, conflict-resolution, developer-tools, git.
- [git-open](https://pkg.so/ja/brew/git-open/) - Shares pkgdb curated category or tags: cli, developer-tools, git, git-extension.
- [git-imerge](https://pkg.so/ja/brew/git-imerge/) - Shares pkgdb curated category or tags: cli, conflict-resolution, developer-tools, git.
- [git-now](https://pkg.so/ja/brew/git-now/) - Shares pkgdb curated category or tags: cli, developer-tools, git, git-extension.
- [git-number](https://pkg.so/ja/brew/git-number/) - Shares pkgdb curated category or tags: cli, developer-tools, git, git-extension.

## Combined YAML source

View the package source record on GitHub. [combined/git-mediate.yml](https://github.com/mxcl/pkgdb/blob/main/combined/git-mediate.yml)


## ソース

- pkg.so package database
- Geiger risk classifier
- package-page enrichment
- curated package history
- package version freshness
- pkgdb category and tag curation
- package relationship graph
- external package-manager database matches
- cross-ecosystem install command graph