diff options
| author | Kristoffer Haugsbakk <code@khaugsbakk.name> | 2026-02-10 20:56:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-10 12:27:07 -0800 |
| commit | 6bfef81c9a2ce5a64ef82fc41164fbdd4713f57a (patch) | |
| tree | 5d530ff4cd4f05cb362692796ceae124cfde2ee6 | |
| parent | 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed (diff) | |
| download | git-6bfef81c9a2ce5a64ef82fc41164fbdd4713f57a.tar.xz | |
doc: rerere-options.adoc: link to git-rerere(1)
Five commands include these options. Let’s link to the command so that
the curious user can learn more about what “rerere” is about.
It’s also better to consistently refer to things like
e.g. “git-subcommand(1)” over `git subcommand` or `subcommand`.
Also apply the same treatment to git-add(1).
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 b0b920144a..4395fe0535 100644 --- a/Documentation/rerere-options.adoc +++ b/Documentation/rerere-options.adoc @@ -4,6 +4,6 @@ the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution. `--no-rerere-autoupdate` is a good way to - double-check what `rerere` did and catch potential + double-check what linkgit:git-rerere[1] did and catch potential mismerges, before committing the result to the index with a - separate `git add`. + separate linkgit:git-add[1]. |