diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-29 16:15:27 -0700 |
| commit | 3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc (patch) | |
| tree | 9fd86e666b7c013395c535607130a3027aa3f54a /Documentation/git-rebase.txt | |
| parent | bf10200871d9e7e1fc9f54aca9b2fe40bc4e4ac7 (diff) | |
| parent | 9b2df3e8d093145f1628af82b94f6dcfc85b9646 (diff) | |
| download | git-3afdeef33e1d7912b8b135df2ea3fef3a3cf60bc.tar.gz | |
Merge branch 'dl/merge-autostash-rebase-quit-fix'
The stash entry created by "git rebase --autosquash" to keep the
initial dirty state were discarded by mistake upon "git rebase
--quit", which has been corrected.
* dl/merge-autostash-rebase-quit-fix:
rebase: save autostash entry into stash reflog on --quit
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 2de8620683..c70c1ec5e0 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` |