]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0d2440 ee8a888)
Merge branch 'ak/restore-both-incompatible-with-conflicts'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:10 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:10 +0000 (15:03 -0700)
commit67076b85b8f82c751fe634abb112139d6e32a5f1
tree4654b1f98b7aee0bc82bf225a419df880a0b9d40tree | snapshot
parentb0d2440442e3455887bd0afaa2c630ef9c4e583dcommit | diff
parentee8a88826af1137f0b192caa39b016032ac96af2commit | 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
builtin/checkout.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.