diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 15:23:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 15:23:52 -0700 |
| commit | f1f5a7b64053a592c7655df84079443328582b68 (patch) | |
| tree | 9f7d07ba52ea6281993ea65e4805aeb31d2f080b /git-rebase.txt | |
| parent | 8d74cd3acd56a5e53475ddc934fdf2e135a634e8 (diff) | |
| download | git-htmldocs-f1f5a7b64053a592c7655df84079443328582b68.tar.gz | |
Autogenerated HTML docs for v1.8.3.1-377-g4d1c5
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index aca840525..c84854ae8 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -208,6 +208,9 @@ rebase.stat:: rebase.autosquash:: If set to true enable '--autosquash' option by default. +rebase.autostash:: + If set to true enable '--autostash' option by default. + OPTIONS ------- --onto <newbase>:: @@ -394,6 +397,13 @@ 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:: + 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 + with care: the final stash application after a successful + rebase might result in non-trivial conflicts. + --no-ff:: With --interactive, cherry-pick all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the |