projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6d4bf58 088018e)
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)
commit4c2941a5fa6c99cb204c48d2fe6f3b55a7211012
treed82509c96a7eeb7260cbd46c423f4b1d978ac04btree | snapshot
parent6d4bf5813cd2c1a3b93fd4f0b231733f82133ccecommit | diff
parent088018e34d705aad696acfeb624cfe5552ba256fcommit | diff
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
Documentation/git-restore.txt diff1 | diff2 | blob | history
builtin/checkout.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.