diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-14 23:19:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-14 23:19:27 -0700 |
| commit | 3adacc2817bf4644928b9430c7c6ed1ca2ef2655 (patch) | |
| tree | 3f9693a0c1b8dc22664e5858a06e422a38d927eb /Documentation/git-rebase.txt | |
| parent | d86ac14dd7258a187fb19ad3d8e11f840350a01f (diff) | |
| parent | cb54fc93e4627d9496fff1c4ba18b1705802d069 (diff) | |
| download | git-3adacc2817bf4644928b9430c7c6ed1ca2ef2655.tar.gz | |
Merge branch 'jc/rerere-autoupdate-doc'
Update documentation on the "--[no-]rerere-autoupdate" option.
* jc/rerere-autoupdate-doc:
doc: clarify rerere-autoupdate
doc: consolidate --rerere-autoupdate description
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 080658c871..1877942180 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -376,10 +376,7 @@ See also INCOMPATIBLE OPTIONS below. + See also INCOMPATIBLE OPTIONS below. ---rerere-autoupdate:: ---no-rerere-autoupdate:: - Allow the rerere mechanism to update the index with the - result of auto-conflict resolution if possible. +include::rerere-options.txt[] -S[<keyid>]:: --gpg-sign[=<keyid>]:: |