diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-17 13:30:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-17 13:30:43 -0800 |
| commit | dba8cfa9c060e0d9eb7eae94531062bdd4a77c58 (patch) | |
| tree | 0b57761dfca9490068f5885f245e9a963407dce5 | |
| parent | 70d3916a7db5233ce01f2f3f36ee04d57c0f9252 (diff) | |
| parent | 6bfef81c9a2ce5a64ef82fc41164fbdd4713f57a (diff) | |
| download | git-dba8cfa9c060e0d9eb7eae94531062bdd4a77c58.tar.xz | |
Merge branch 'kh/doc-rerere-options-xref'
Doc update.
* kh/doc-rerere-options-xref:
doc: rerere-options.adoc: link to git-rerere(1)
| -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]. |