From: Junio C Hamano Date: Tue, 24 Jun 2025 16:49:50 +0000 (-0700) Subject: Merge branch 'lm/add-p-context' into seen X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=841fb98ce28d985d7737e8ea51129c23d18b32f0;p=thirdparty%2Fgit.git Merge branch 'lm/add-p-context' into seen "git add/etc -p" now honors diff.context configuration variable, and learns to honor -U option. * lm/add-p-context: add-patch: add diff.context command line overrides add-patch: respect diff.context configuration test: refactor to use "test_config" test: refactor to use "test_grep" --- 841fb98ce28d985d7737e8ea51129c23d18b32f0 diff --cc Documentation/git-checkout.adoc index ee83b6d9ba,896372fd7a..40e02cfd65 --- a/Documentation/git-checkout.adoc +++ b/Documentation/git-checkout.adoc @@@ -289,7 -289,9 +289,9 @@@ section of linkgit:git-add[1] to learn Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode. + include::diff-context-options.adoc[] + ---ignore-other-worktrees:: +`--ignore-other-worktrees`:: `git checkout` refuses when the wanted branch is already checked out or otherwise in use by another worktree. This option makes it check the branch out anyway. In other words, the branch can