git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d4bf58 088018e)
Merge branch 'es/restore-staged-from-head-by-default'
authorJunio C Hamano <redacted>
Fri, 8 May 2020 21:25:08 +0000 (14:25 -0700)
committerJunio C Hamano <redacted>
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 patch | diff1 | diff2 | blob | history
builtin/checkout.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-restore.txt
Simple merge
diff --cc builtin/checkout.c
Simple merge
git clone https://git.99rst.org/PROJECT