From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 May 2020 21:25:08 +0000 (-0700)
Subject: Merge branch 'es/restore-staged-from-head-by-default'
X-Git-Tag: v2.27.0-rc0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c2941a5fa6c99cb204c48d2fe6f3b55a7211012;p=thirdparty%2Fgit.git

Merge branch 'es/restore-staged-from-head-by-default'

"git restore --staged --worktree" now defaults to take the contents
out of "HEAD", instead of erring out.

* es/restore-staged-from-head-by-default:
  restore: default to HEAD when combining --staged and --worktree
---

4c2941a5fa6c99cb204c48d2fe6f3b55a7211012