diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-07-10 00:00:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-07-10 00:00:45 +0300 |
commit | 3ed0f1e3a17b4fea15ad1e0b0d4c0eb50b23803a (patch) | |
tree | bc6ba4c78a4db4ed4d10e0cb54febd03fa36a690 /Documentation | |
parent | 9850823f06246a235607afd295b1f9381124890e (diff) | |
parent | 81de0c01cf72ae5dfdee29b580d8a93f1d4f6d69 (diff) |
Merge branch 'ma/rebase-doc-typofix' into master
Typofix.
* ma/rebase-doc-typofix:
git-rebase.txt: fix description list separator
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 4624cfd288..374d2486f7 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -259,7 +259,7 @@ See also INCOMPATIBLE OPTIONS below. unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list. ---apply: +--apply:: Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does. |