diff options
| author | John Keeping <john@keeping.me.uk> | 2015-09-10 22:30:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-11 00:42:04 (GMT) |
| commit | 82e0668cde032379095b0581609c73646e9eb92a (patch) | |
| tree | cb27a5140a953e1c91c05bda75e306be7fa32bd1 | |
| parent | 619e3604288ab54c3694e99746661caf0f2df961 (diff) | |
| download | git-82e0668cde032379095b0581609c73646e9eb92a.zip git-82e0668cde032379095b0581609c73646e9eb92a.tar.gz git-82e0668cde032379095b0581609c73646e9eb92a.tar.bz2 | |
Documentation/git-rebase: fix --no-autostash formatting
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 924827d..73cba04 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -417,7 +417,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 |