| commit | 4c2941a5fa6c99cb204c48d2fe6f3b55a7211012 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 May 2020 21:25:08 +0000 (8 14:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 8 May 2020 21:25:08 +0000 (8 14:25 -0700) | ||
| tree | d82509c96a7eeb7260cbd46c423f4b1d978ac04b | treesnapshot (tar.gz zip) |
| parent | 6d4bf5813cd2c1a3b93fd4f0b231733f82133cce | commitdiff |
| parent | 088018e34d705aad696acfeb624cfe5552ba256f | commitdiff |
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
"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 | blobhistory |
| builtin/checkout.c | diff1 | diff2 | blobhistory |