Skip to content

Commit

Permalink
Update doc
Browse files Browse the repository at this point in the history
  • Loading branch information
jarun committed May 30, 2022
1 parent 10e2d37 commit a70ad9c
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions patches/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ This directory contains sizable user submitted patches that were rejected from m
The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatability patch is provided and will automatically be applied.

## List of patches

| Patch (a-z) | Description | Make var |
| --- | --- | --- |
| gitstatus | Add git status column to the detail view. Provides command line flag `-G` to show column in normal mode. | `O_GITSTATUS` |
Expand All @@ -15,6 +16,8 @@ To apply a patch, use the corresponding make variable, e.g.:

make O_NAMEFIRST=1

## Resolving patch conflicts

Whenever patch conflicts occur on the latest master, pull requests resolving them are welcome. Let's say a conflict occurs in the `restorepreview` patch. The best way to resolve this conflict would be something along the lines of:

- Ensure you're on latest master and run `cp src/nnn.c src/nnn.c.orig && make O_RESTOREPREVIEW=1`. This will save a copy of the source from master in `src/nnn.c.orig` and generate conflict markers in `src/nnn.c`.
Expand Down

0 comments on commit a70ad9c

Please sign in to comment.