From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Revert back to “Git's” which was used before d30c5cc4592 (doc: convert git-mergetool options to new synopsis style, 2025-05-25) accidentally changed it.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> ---
Notes (series):
I didn’t find any other occurrences.
Demo with this commit merged into ‘master’:
$ git grep -e '`s\b' -e '`re\b'
Documentation/MyFirstObjectWalk.adoc:block under the `#include`s in `revision.h`. The most likely ones to be set in
Documentation/ReviewingGuidelines.adoc:cooking" emails & replies can be found using the query `s:"What's cooking"` on
Documentation/ReviewingGuidelines.adoc:like `s:"PATCH" -s:"Re:"`. You can browse these results for topics relevant to
Documentation/git-add.adoc:You also could say `s` or `sta` or `status` above as long as the
Documentation/git-mailinfo.adoc:* Leading `Re:`, `re:`, and `:`.
add-interactive.c: * It is implemented in the form of a pair of `string_list`s, the first one
add-patch.c: * appended to the strbuf `s->plain`.
add-patch.c: * `s->buf` still contains the part of the
compat/regex/regexec.c: string `s' and transit to `b':
reftable/record.h:/* Advance `s.buf` by `n`, and decrease length. */
t/t0013/shattered-1.pdf matches
t/t0040-parse-options.sh: error: switch `s'\'' requires a value
t/t1092-sparse-checkout-compatibility.sh: # The following `git reset`s result in updating the index on files with
On ‘master’:
$ git grep -e '`s\b' -e '`re\b'
Documentation/MyFirstObjectWalk.adoc:block under the `#include`s in `revision.h`. The most likely ones to be set in
Documentation/ReviewingGuidelines.adoc:cooking" emails & replies can be found using the query `s:"What's cooking"` on
Documentation/ReviewingGuidelines.adoc:like `s:"PATCH" -s:"Re:"`. You can browse these results for topics relevant to
Documentation/config/mergetool.adoc: are the versions of the file from before Git`s conflict
Documentation/git-add.adoc:You also could say `s` or `sta` or `status` above as long as the
Documentation/git-mailinfo.adoc:* Leading `Re:`, `re:`, and `:`.
add-interactive.c: * It is implemented in the form of a pair of `string_list`s, the first one
add-patch.c: * appended to the strbuf `s->plain`.
add-patch.c: * `s->buf` still contains the part of the
compat/regex/regexec.c: string `s' and transit to `b':
reftable/record.h:/* Advance `s.buf` by `n`, and decrease length. */
Binary file t/t0013/shattered-1.pdf matches
t/t0040-parse-options.sh: error: switch `s'\'' requires a value
t/t1092-sparse-checkout-compatibility.sh: # The following `git reset`s result in updating the index on files withDocumentation/config/mergetool.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/config/mergetool.adoc +1 −1
diff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc index 6be506145c1..7064f5a462c 100644 --- a/Documentation/config/mergetool.adoc +++ b/Documentation/config/mergetool.adoc @@ -65,7 +65,7 @@ endif::[] During a merge, Git will automatically resolve as many conflicts as possible and write the `$MERGED` file containing conflict markers around any conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally - are the versions of the file from before Git`s conflict + are the versions of the file from before Git's conflict resolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the `mergetool.<tool>.hideResolved` base-commit: b983aaabc8b8cf406686f23689dda7e226f67e44
-- 2.51.0.103.g04b6f1b0792
