From d8de1b23e8ec896759424a2f146969783cdd89e3 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Tue, 22 Sep 2026 19:53:29 +0200
Subject: Add conflcit resultions strategies and interactive mode, and a lot of
 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <m@maandree.se>
---
 git-rediff.1 | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 107 insertions(+), 3 deletions(-)

(limited to 'git-rediff.1')

diff --git a/git-rediff.1 b/git-rediff.1
index db970c6..84598d5 100644
--- a/git-rediff.1
+++ b/git-rediff.1
@@ -2,12 +2,116 @@
 .SH NAME
 git-rediff - Reduce partially resolved merge conflicts
 .SH SYNOPSIS
-.I git rediff
-[<path>...]
+.B git rediff
+.RB [ --no-reduce ]
+.RB [ --merge | --select-head | --select-tail ]
+.RB [ --remove-base ]
+.RB [ -i ]
+.RI [ <path> "...]"
 .SH DESCRIPTION
-.I git rediff
+.B git rediff
 rewrites files containing merge conflicts to
 remove conflicts that have been resolved.
+.SH OPTIONS
+.TP
+.B -i
+.TQ
+.B --interactive
+Interactively select the action for each merge conflict. See
+.BR "INTERACTIVE COMMANDS" .
+
+This overrides all other options.
+.TP
+.B --no-interactive
+Disable
+.BR --interactive .
+.TP
+.B -m
+.TQ
+.B --merge
+For conflicts with at least three branches, select the sole branch
+whose content differs from all other identical branches, but only
+if that is the top or bottom branch.
+
+Applied before
+.BR --remove-base .
+.TP
+.B --no-merge
+Disable
+.BR --merge .
+.TP
+.B --reduce
+Enable reduction of remaining conflicts. (Default)
+.TP
+.B --no-reduce
+Do not reduce remaining conflicts after
+.BR --merge ,
+.BR --remove-base ,
+.BR --select-head ,
+and
+.B --select-tail
+have been applied.
+.TP
+.B --remove-base
+Remove the middle branch from three-way merge conflicts.
+
+Applied before
+.BR --reduce .
+.TP
+.B --no-remove-base
+Disable
+.BR --remove-base .
+.TP
+.B --select-head
+Resolve each merge conflict by selecting its top branch.
+
+Applied before
+.BR --reduce .
+.TP
+.B --no-select-head
+Disable
+.BR --select-head .
+.TP
+.B --select-tail
+Resolve each merge conflict by selecting its bottom branch.
+
+Applied before
+.BR --reduce .
+.TP
+.B --no-select-tail
+Disable
+.BR --select-tail .
+.SH INTERACTIVE COMMANDS
+.TP
+.B h
+Select the top branch.
+.TP
+.B t
+Select the bottom branch.
+.TP
+.B b
+Remove the middle branch (three-way conflicts only).
+.TP
+.B m
+Apply merge selection.
+.TP
+.B r
+Reduce the conflict.
+.TP
+.B e
+Manually edit the conflict.
+.TP
+.B s
+Skip the conflict.
+.TP
+.B d
+Skip the conflict and all later conflicts in the current file.
+.TP
+.B q
+Quit interaction and skip the conflict and all remaining conflicts.
+.TP
+.B ?
+Display help.
 .SH OPERANDS
 .TP
 .I path
-- 
cgit v1.3.1