From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2020 22:50:06 +0000 (-0700)
Subject: Merge branch 'js/stash-p-fix'
X-Git-Tag: v2.27.0-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e81ecff10a19acea0bf58a260e919b1920925108;p=thirdparty%2Fgit.git

Merge branch 'js/stash-p-fix'

Allowing the user to split a patch hunk while "git stash -p" does
not work well; a band-aid has been added to make this (partially)
work better.

* js/stash-p-fix:
  stash -p: (partially) fix bug concerning split hunks
  t3904: fix incorrect demonstration of a bug
---

e81ecff10a19acea0bf58a260e919b1920925108