diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 16:18:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 16:18:36 -0800 |
| commit | 52b1cfba6ed4a0278108ca4deaf3f7646abd1fbb (patch) | |
| tree | d192843d5b628529a7b62665db83e4e79e1c347d /git-rebase.txt | |
| parent | 18a1532395f7adb2f9972cdc8551b3fa13f2a4a4 (diff) | |
| download | git-htmldocs-52b1cfba6ed4a0278108ca4deaf3f7646abd1fbb.tar.gz | |
Autogenerated HTML docs for v2.11.0-161-g6610a
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index de222c81a..67d48e688 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -12,7 +12,7 @@ SYNOPSIS [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] -'git rebase' --continue | --skip | --abort | --edit-todo +'git rebase' --continue | --skip | --abort | --quit | --edit-todo DESCRIPTION ----------- @@ -252,6 +252,11 @@ leave out at most one of A and B, in which case it defaults to HEAD. will be reset to where it was when the rebase operation was started. +--quit:: + Abort the rebase operation but HEAD is not reset back to the + original branch. The index and working tree are also left + unchanged as a result. + --keep-empty:: Keep the commits that do not change anything from its parents in the result. |