diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-04-28 09:31:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 19:35:38 (GMT) |
| commit | 9b2df3e8d093145f1628af82b94f6dcfc85b9646 (patch) | |
| tree | c804fc971189f0da9df34f104360002720c9d64d /Documentation/git-rebase.txt | |
| parent | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (diff) | |
| download | git-9b2df3e8d093145f1628af82b94f6dcfc85b9646.zip git-9b2df3e8d093145f1628af82b94f6dcfc85b9646.tar.gz git-9b2df3e8d093145f1628af82b94f6dcfc85b9646.tar.bz2 | |
rebase: save autostash entry into stash reflog on --quit
In a03b55530a (merge: teach --autostash option, 2020-04-07), the
--autostash option was introduced for `git merge`. Notably, when
`git merge --quit` is run with an autostash entry present, it is saved
into the stash reflog. This is contrasted with the current behaviour of
`git rebase --quit` where the autostash entry is simply just dropped out
of existence.
Adopt the behaviour of `git merge --quit` in `git rebase --quit` and
save the autostash entry into the stash reflog instead of just deleting
it.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f7a6033..7d0c89a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -256,7 +256,8 @@ See also INCOMPATIBLE OPTIONS below. --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. + unchanged as a result. If a temporary stash entry was created + using --autostash, it will be saved to the stash reflog. --apply: Use applying strategies to rebase (calling `git-am` |