Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.35.0 2022-01-24T17:25:25Z 2022-01-24T17:25:25Z Junio C Hamano gitster@pobox.com 2022-01-24T17:25:25Z urn:sha1:89bece5c8c96f0b962cfc89e63f82d603fd60bed Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-01-20T23:25:38Z Junio C Hamano gitster@pobox.com 2022-01-20T23:25:38Z urn:sha1:297ca895a27a6bbdb7906371d533f72a12ad25b2 "git branch -h" incorrectly said "--track[=direct|inherit]", implying that "--trackinherit" is a valid option, which has been corrected. source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com> source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de> * js/branch-track-inherit: branch,checkout: fix --track documentation 2022-01-20T19:07:51Z René Scharfe l.s.r@web.de 2022-01-20T12:35:54Z urn:sha1:6327f0efed36c64d98a140110171362b7cb75a52 Document that the accepted variants of the --track option are --track, --track=direct, and --track=inherit. The equal sign in the latter two cannot be replaced with whitespace; in general optional arguments need to be attached firmly to their option. Put "direct" consistently before "inherit", if only for the reasons that the former is the default, explained first in the documentation, and comes before the latter alphabetically. Mention both modes in the short help so that readers don't have to look them up in the full documentation. They are literal strings and thus untranslatable. PARSE_OPT_LITERAL_ARGHELP is inferred due to the pipe and parenthesis characters, so we don't have to provide that flag explicitly. Mention that -t has the same effect as --track and --track=direct. There is no way to specify inherit mode using the short option, because short options generally don't accept optional arguments. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-01-13T00:27:08Z Junio C Hamano gitster@pobox.com 2022-01-13T00:27:08Z urn:sha1:1ffcbaa1a5f10c9f706314d77f88de20a4a498c2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-01-10T19:52:57Z Junio C Hamano gitster@pobox.com 2022-01-10T19:28:51Z urn:sha1:90d242d36e248acfae0033274b524bfa55a947fd Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-01-10T19:52:55Z Junio C Hamano gitster@pobox.com 2022-01-10T19:52:55Z urn:sha1:def8c6a05d3e06d70ce71c6f8cd0d2656dd6c966 Extend the guidance to choose the base commit to build your work on, and hint/nudge contributors to read others' changes. * jc/doc-submitting-patches-choice-of-base: SubmittingPatchs: clarify choice of base and testing 2022-01-10T19:52:54Z Junio C Hamano gitster@pobox.com 2022-01-10T19:52:54Z urn:sha1:0669bdf4ebc095a2b26654292e1ff38245ccf88a "git -c branch.autosetupmerge=inherit branch new old" makes "new" to have the same upstream as the "old" branch, instead of marking "old" itself as its upstream. * js/branch-track-inherit: config: require lowercase for branch.*.autosetupmerge branch: add flags and config to inherit tracking branch: accept multiple upstream branches for tracking 2022-01-10T19:52:50Z Junio C Hamano gitster@pobox.com 2022-01-10T19:52:50Z urn:sha1:3c0e4178277dee1cdc4607d7277a368379b12b3f "git fetch" and "git pull" are now declared sparse-index clean. Also "git ls-files" learns the "--sparse" option to help debugging. * ds/fetch-pull-with-sparse-index: test-read-cache: remove --table, --expand options t1091/t3705: remove 'test-tool read-cache --table' t1092: replace 'read-cache --table' with 'ls-files --sparse' ls-files: add --sparse option fetch/pull: use the sparse index 2022-01-05T22:01:31Z Junio C Hamano gitster@pobox.com 2022-01-05T21:56:49Z urn:sha1:e83ba647f7c61cf945690d6a0bd8c172a6498dc8 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2022-01-05T22:01:30Z Junio C Hamano gitster@pobox.com 2022-01-05T22:01:30Z urn:sha1:2a6c7f996e85aab2173a378349e8c0d952755686 Doc markup fix. * gh/gpg-doc-markup-fix: docs: add missing colon to Documentation/config/gpg.txt