diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:39:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 13:39:53 -0700 |
| commit | 1eb5609b6b3e2908ee747dfe313c24f17334ce26 (patch) | |
| tree | 7399ab13ecb59275ff9caa0624441831a5b0f8de /git-rebase.txt | |
| parent | 70d664063d4eb347c0d30071e08a40fbf72dcd34 (diff) | |
| download | git-htmldocs-1eb5609b6b3e2908ee747dfe313c24f17334ce26.tar.gz | |
Autogenerated HTML docs for v2.6.1-120-g24a00e
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index ca039546a..6cca8bb51 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -294,7 +294,9 @@ which makes little sense. -S[<keyid>]:: --gpg-sign[=<keyid>]:: - GPG-sign commits. + GPG-sign commits. The `keyid` argument is optional and + defaults to the committer identity; if specified, it must be + stuck to the option without a space. -q:: --quiet:: @@ -432,7 +434,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 |