[PATCH 2/2] Documentation/git-rebase: fix --no-autostash formatting
- From
John Keeping <john@keeping.me.uk>
- Date
- Sep 10, 2015, 22:30 UTC
- Message-ID
- <5c846ceeefd55e3a46ed1f3937fc74bd7720a892.1441924193.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1441924193.git.john@keeping.me.uk>
All of the other "--option" and "--no-option" pairs in this file are formatted as separate options.
Signed-off-by: John Keeping <john@keeping.me.uk> --- Documentation/git-rebase.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index ca03954..72e69fc 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -432,7 +432,8 @@ If the '--autosquash' option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting. ---[no-]autostash:: +--autostash:: +--no-autostash:: Automatically create a temporary stash before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use
-- 2.6.0.rc0.162.gb2d3693