diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2025-05-25 20:27:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-27 07:50:59 -0700 |
| commit | 5f3213232fa052e62b6ec33447aa50936ef1e232 (patch) | |
| tree | cbb123cc31ea18c8be9deacf7de4d63bbfd1d5ef /Documentation/rerere-options.adoc | |
| parent | 13d5331cccf8c23f1d4eb9b6a24e2308c8631d00 (diff) | |
| download | git-5f3213232fa052e62b6ec33447aa50936ef1e232.tar.xz | |
doc: convert merge options to new synopsis format
- Use _<placeholder>_ instead of <placeholder> in the description
- Use `backticks` for keywords and more complex option
descriptions. The new rendering engine will apply synopsis rules to
these spans.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/rerere-options.adoc')
| -rw-r--r-- | Documentation/rerere-options.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/rerere-options.adoc b/Documentation/rerere-options.adoc index c3321ddea2..b0b920144a 100644 --- a/Documentation/rerere-options.adoc +++ b/Documentation/rerere-options.adoc @@ -1,5 +1,5 @@ ---rerere-autoupdate:: ---no-rerere-autoupdate:: +`--rerere-autoupdate`:: +`--no-rerere-autoupdate`:: After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of |