Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-rebase: fix --no-autostash formatting
author
John Keeping
<john@keeping.me.uk>
Thu, 10 Sep 2015 22:30:52 +0000
(23:30 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 11 Sep 2015 00:42:04 +0000
(17:42 -0700)
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>
Documentation/git-rebase.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (from parent 1:
619e360
)
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 924827dc2ec79fc4df83a572dcef89425b844f81..73cba04887cb9896dea9c1f852206b8c88f219d8 100644
(file)
--- 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.
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
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