]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/restore-staged-from-head-by-default'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 May 2020 21:25:08 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 May 2020 21:25:08 +0000 (14:25 -0700)
"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

1  2 
Documentation/git-restore.txt
builtin/checkout.c

Simple merge
Simple merge