diff options
author | Eric Sunshine <sunshine@sunshineco.com> | 2020-05-05 03:17:16 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-05-05 11:27:38 -0700 |
commit | 088018e34d705aad696acfeb624cfe5552ba256f (patch) | |
tree | 9b01540e27bf191fee28c00586eaba938dc1774e /t/t5100/msg0017 | |
parent | Git 2.26.2 (diff) | |
download | tgif-088018e34d705aad696acfeb624cfe5552ba256f.tar.xz |
restore: default to HEAD when combining --staged and --worktree
By default, files are restored from the index for --worktree, and from
HEAD for --staged. When --worktree and --staged are combined, --source
must be specified to disambiguate the restore source[1], thus making it
cumbersome to restore a file in both the worktree and the index.
However, HEAD is also a reasonable default for --worktree when combined
with --staged, so make it the default anytime --staged is used (whether
combined with --worktree or not).
[1]: Due to an oversight, the --source requirement, though documented,
is not actually enforced.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/msg0017')
0 files changed, 0 insertions, 0 deletions