diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 22:45:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 22:45:35 (GMT) |
| commit | 06cd5a1e01328724b7709ac232e36263e59f5f26 (patch) | |
| tree | cd234c23f5d18c2e60ea61b33f1a6b98c08d8619 /Documentation | |
| parent | f008159fc2dec7b98e74736751d3e6ad8d9c060f (diff) | |
| parent | 9512177b68263085fef84cdbd45ecdee7bfe2377 (diff) | |
| download | git-06cd5a1e01328724b7709ac232e36263e59f5f26.zip git-06cd5a1e01328724b7709ac232e36263e59f5f26.tar.gz git-06cd5a1e01328724b7709ac232e36263e59f5f26.tar.bz2 | |
Merge branch 'nd/rebase-forget'
"git rebase" learned "--quit" option, which allows a user to
remove the metadata left by an earlier "git rebase" that was
manually aborted without using "git rebase --abort".
* nd/rebase-forget:
rebase: add --quit to cleanup rebase, leave everything else untouched
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index de222c8..67d48e6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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. |