diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:58 +0900 |
| commit | b78c5fe96cadf10c49b968b716a913acf43cc28e (patch) | |
| tree | 2ba9f0199e97bbd1c591eb0f420ef139b5b087fd /t/lib-rebase.sh | |
| parent | 9d322282e4a5be1c908d73c8039f99cb9950f8f3 (diff) | |
| parent | ffae8b2f904f0a82417ac24cb2684bbe5ca234e1 (diff) | |
| download | git-b78c5fe96cadf10c49b968b716a913acf43cc28e.tar.gz | |
Merge branch 'js/rebase-autostash-fix'
"git rebase" that has recently been rewritten in C had a few issues
in its "--autstash" feature, which have been corrected.
* js/rebase-autostash-fix:
rebase --autostash: fix issue with dirty submodules
rebase --autostash: demonstrate a problem with dirty submodules
rebase (autostash): use an explicit OID to apply the stash
rebase (autostash): store the full OID in <state-dir>/autostash
rebase (autostash): avoid duplicate call to state_dir_path()
Diffstat (limited to 't/lib-rebase.sh')
0 files changed, 0 insertions, 0 deletions