diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:08 -0700 |
| commit | 4c2941a5fa6c99cb204c48d2fe6f3b55a7211012 (patch) | |
| tree | d82509c96a7eeb7260cbd46c423f4b1d978ac04b /Documentation/merge-options.txt | |
| parent | Merge branch 'jk/arith-expansion-coding-guidelines' (diff) | |
| parent | restore: default to HEAD when combining --staged and --worktree (diff) | |
| download | tgif-4c2941a5fa6c99cb204c48d2fe6f3b55a7211012.tar.xz | |
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
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions