aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMirek Kratochvil <miroslav.kratochvil@uni.lu>2025-07-23 11:15:33 +0200
committerMirek Kratochvil <miroslav.kratochvil@uni.lu>2025-07-23 11:18:27 +0200
commit8f9677e40fe7e8e23d07da0b06be04ed10d3f649 (patch)
tree524b9f7002412481e4c205aa33fc9a31b06374a3 /README.md
parentb52b106ac50a0100e41843e2bd2edcbb74a10b6e (diff)
downloadwerge-8f9677e40fe7e8e23d07da0b06be04ed10d3f649.tar.gz
werge-8f9677e40fe7e8e23d07da0b06be04ed10d3f649.tar.bz2
improve the patch subcommand a little
closes https://github.com/exaexa/werge/issues/1
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/README.md b/README.md
index e4b9398..62a32bc 100644
--- a/README.md
+++ b/README.md
@@ -279,12 +279,15 @@ Available options:
#### Patching files in place
```
-Usage: werge patch MYFILE
+Usage: werge patch (MYFILE | (-f|--format)) [-p|--patch PATCH]
- Apply a patch from `diff' to file
+ Modify a file using a patch from `diff'
Available options:
- MYFILE File to be modified
+ MYFILE File to be patched
+ -f,--format Do not patch anything, only format the patch using
+ conflict marks on joined tokens
+ -p,--patch PATCH File with the patch (default: stdin)
-h,--help Show this help text
```