From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:58 +0000 (+0900)
Subject: Merge branch 'js/rebase-autostash-fix'
X-Git-Tag: v2.20.0-rc0~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b78c5fe96cadf10c49b968b716a913acf43cc28e;p=git

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()
---

b78c5fe96cadf10c49b968b716a913acf43cc28e