diff options
| author | Mattias Andrée <maandree@kth.se> | 2024-08-15 20:34:56 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2024-08-15 20:35:46 +0200 |
| commit | d6ffd770726450ae44f08fa3a74cdebb1e382bdf (patch) | |
| tree | 4a66373044baffd1171912d672842b85babe5de3 /git-rediff.1 | |
| parent | First commit (diff) | |
| download | git-rediff-d6ffd770726450ae44f08fa3a74cdebb1e382bdf.tar.gz git-rediff-d6ffd770726450ae44f08fa3a74cdebb1e382bdf.tar.bz2 git-rediff-d6ffd770726450ae44f08fa3a74cdebb1e382bdf.tar.xz | |
Add README and git-rediff.1
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| -rw-r--r-- | git-rediff.1 | 34 |
1 files changed, 34 insertions, 0 deletions
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. |