diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:10 -0700 |
| commit | 67076b85b8f82c751fe634abb112139d6e32a5f1 (patch) | |
| tree | 4654b1f98b7aee0bc82bf225a419df880a0b9d40 /builtin/count-objects.c | |
| parent | b0d2440442e3455887bd0afaa2c630ef9c4e583d (diff) | |
| parent | ee8a88826af1137f0b192caa39b016032ac96af2 (diff) | |
Merge branch 'ak/restore-both-incompatible-with-conflicts'
"git restore" supports options like "--ours" that are only
meaningful during a conflicted merge, but these options are only
meaningful when updating the working tree files. These options are
marked to be incompatible when both "--staged" and "--worktree" are
in effect.
* ak/restore-both-incompatible-with-conflicts:
restore: fault --staged --worktree with merge opts
Diffstat (limited to 'builtin/count-objects.c')
0 files changed, 0 insertions, 0 deletions