aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMattias Andrée <m@maandree.se>2026-09-25 19:19:15 +0200
committerMattias Andrée <m@maandree.se>2026-09-25 19:19:15 +0200
commit7c19d0103e46c9e59b512095693491a4093a13f3 (patch)
tree85a9cd750a1fa317b6d3866add9d546c7df44b56 /README
parentAdd --symmetric (diff)
downloadgit-rediff-eedff41d3cc0347670eedb6ff0781c1138a23ce1.tar.gz
git-rediff-eedff41d3cc0347670eedb6ff0781c1138a23ce1.tar.bz2
git-rediff-eedff41d3cc0347670eedb6ff0781c1138a23ce1.tar.xz
Add support for combining --merge and --symmetricHEAD1.3master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index 9940917..7340a78 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
git-rediff - Reduce partially resolved merge conflicts
SYNOPSIS
- git rediff [--merge|--symmetric|--select-head|--select-tail]
+ git rediff [-my|--select-head|--select-tail]
[--remove-base] [--no-reduce] [-i] [<path>...]
DESCRIPTION