From d6ffd770726450ae44f08fa3a74cdebb1e382bdf Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Thu, 15 Aug 2024 20:34:56 +0200
Subject: Add README and git-rediff.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 README       | 27 +++++++++++++++++++++++++++
 git-rediff.1 | 34 ++++++++++++++++++++++++++++++++++
 git-rediff.c |  2 +-
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 README
 create mode 100644 git-rediff.1

diff --git a/README b/README
new file mode 100644
index 0000000..818b3fc
--- /dev/null
+++ b/README
@@ -0,0 +1,27 @@
+NAME
+	git-rediff - Reduce partially resovled merge conflicts
+
+SYNOPSIS
+	git rediff [<path>...]
+
+DESCRIPTION
+	git rediff rewrites files containing merge conflicts to
+	remove conflicts that have been resolved.
+
+OPERANDS
+	path
+		File to rewrite. If - is specified, the file
+		is read from standard input, and the result
+		is written to standard output.
+
+	If no path is specified, standard input is read and
+	the result is written to standard output.
+
+EXIT STATUS
+	The following exit values are returned:
+
+	0    All merge conflicts where resolved.
+
+	1    There are still merge conflicts.
+
+	2    An error occurred.
diff --git a/git-rediff.1 b/git-rediff.1
new file mode 100644
index 0000000..5374e85
--- /dev/null
+++ b/git-rediff.1
@@ -0,0 +1,34 @@
+.TH GIT-REDIFF 1
+.SH NAME
+git-rediff - Reduce partially resovled merge conflicts
+.SH SYNOPSIS
+.I git rediff
+[<path>...]
+.SH DESCRIPTION
+.I git rediff
+rewrites files containing merge conflicts to
+remove conflicts that have been resolved.
+.SH OPERANDS
+.TP
+.I path
+File to rewrite. If
+.B -
+is specified, the file
+is read from standard input, and the result
+is written to standard output.
+.PP
+If no
+.I path
+is specified, standard input is read and
+the result is written to standard output.
+.SH EXIT STATUS
+The following exit values are returned:
+.TP
+0
+All merge conflicts where resolved.
+.TP
+1
+There are still merge conflicts.
+.TP
+2
+An error occurred.
diff --git a/git-rediff.c b/git-rediff.c
index 07629ef..009565c 100644
--- a/git-rediff.c
+++ b/git-rediff.c
@@ -6,7 +6,7 @@
 #include <libsimple.h>
 #include <libsimple-arg.h>
 
-USAGE("[file] ...");
+USAGE("[<path>...]");
 
 #if defined(__clang__)
 # pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
-- 
cgit v1.2.3-70-g09d2