summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-07-09 14:00:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-09 14:00:45 -0700
commit3ed0f1e3a17b4fea15ad1e0b0d4c0eb50b23803a (patch)
treebc6ba4c78a4db4ed4d10e0cb54febd03fa36a690 /Documentation
parentMerge branch 'jn/eject-fetch-write-commit-graph-out-of-experimental' into master (diff)
parentgit-rebase.txt: fix description list separator (diff)
downloadtgif-3ed0f1e3a17b4fea15ad1e0b0d4c0eb50b23803a.tar.xz
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.txt2
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.