From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Jul 2020 21:00:44 +0000 (-0700)
Subject: Merge branch 'ma/rebase-doc-typofix' into master
X-Git-Tag: v2.28.0-rc0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ed0f1e3a17b4fea15ad1e0b0d4c0eb50b23803a;p=thirdparty%2Fgit.git

Merge branch 'ma/rebase-doc-typofix' into master

Typofix.

* ma/rebase-doc-typofix:
  git-rebase.txt: fix description list separator
---

3ed0f1e3a17b4fea15ad1e0b0d4c0eb50b23803a
diff --cc Documentation/git-rebase.txt
index 4624cfd288,9acea055d7..374d2486f7
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -256,10 -256,9 +256,10 @@@ See also INCOMPATIBLE OPTIONS below
  --quit::
  	Abort the rebase operation but HEAD is not reset back to the
  	original branch. The index and working tree are also left
 -	unchanged as a result.
 +	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.