From d6ffd770726450ae44f08fa3a74cdebb1e382bdf Mon Sep 17 00:00:00 2001 From: Mattias Andrée 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 --- README | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 README (limited to 'README') 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 [...] + +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. -- cgit v1.2.3-70-g09d2