summaryrefslogtreecommitdiff
path: root/Documentation
AgeCommit message (Collapse)Author
2022-12-13Git 2.37.5v2.37.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Merge branch 'maint-2.36' into maint-2.37Junio C Hamano
2022-12-13Git 2.36.4v2.36.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Merge branch 'maint-2.35' into maint-2.36Junio C Hamano
2022-12-13Git 2.35.6v2.35.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Merge branch 'maint-2.34' into maint-2.35Junio C Hamano
2022-12-13Git 2.34.6v2.34.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Merge branch 'maint-2.33' into maint-2.34Junio C Hamano
2022-12-13Git 2.33.6v2.33.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Sync with Git 2.32.5Junio C Hamano
2022-12-13Git 2.32.5v2.32.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Sync with Git 2.31.6Junio C Hamano
2022-12-13Git 2.31.6v2.31.6Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-13Sync with Git 2.30.7Junio C Hamano
2022-12-13Git 2.30.7v2.30.7Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-10-06Sync with 2.36.3Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.36.3v2.36.3Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Sync with 2.35.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.35.5v2.35.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Sync with 2.34.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.34.5v2.34.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Sync with 2.33.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.33.5v2.33.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Sync with 2.32.4Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.32.4v2.32.4Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Sync with 2.31.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.31.5v2.31.5Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Sync with 2.30.6Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-06Git 2.30.6v2.30.6Taylor Blau
Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-10-01transport: make `protocol.file.allow` be "user" by defaultTaylor Blau
An earlier patch discussed and fixed a scenario where Git could be used as a vector to exfiltrate sensitive data through a Docker container when a potential victim clones a suspicious repository with local submodules that contain symlinks. That security hole has since been plugged, but a similar one still exists. Instead of convincing a would-be victim to clone an embedded submodule via the "file" protocol, an attacker could convince an individual to clone a repository that has a submodule pointing to a valid path on the victim's filesystem. For example, if an individual (with username "foo") has their home directory ("/home/foo") stored as a Git repository, then an attacker could exfiltrate data by convincing a victim to clone a malicious repository containing a submodule pointing at "/home/foo/.git" with `--recurse-submodules`. Doing so would expose any sensitive contents in stored in "/home/foo" tracked in Git. For systems (such as Docker) that consider everything outside of the immediate top-level working directory containing a Dockerfile as inaccessible to the container (with the exception of volume mounts, and so on), this is a violation of trust by exposing unexpected contents in the working copy. To mitigate the likelihood of this kind of attack, adjust the "file://" protocol's default policy to be "user" to prevent commands that execute without user input (including recursive submodule initialization) from taking place by default. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com>
2022-09-13Merge a handful of topics from the 'master' frontJunio C Hamano
As the 'master' front will soon tag a preview and then release candidates for 2.38, it is unknown if we are going to issue another maintenance release on the 2.37.x track, but as we have accumulated enough material there, let's prepare a draft for it. Even if we end up not tagging 2.37.4, it would help motivated distro packagers to maintain their slightly older and "more stable" versions. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-30Git 2.37.3v2.37.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-26A handful more topics from the 'master' front for 2.37.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-26Merge branch 'po/doc-add-renormalize' into maintJunio C Hamano
Documentation for "git add --renormalize" has been improved. source: <20220810144450.470-2-philipoakley@iee.email> * po/doc-add-renormalize: doc add: renormalize is not idempotent for CRCRLF
2022-08-26Merge branch 'gc/git-reflog-doc-markup' into maintJunio C Hamano
Doc mark-up fix. source: <pull.1304.git.git.1659387885711.gitgitgadget@gmail.com> * gc/git-reflog-doc-markup: Documentation/git-reflog: remove unneeded \ from \{
2022-08-10Git 2.37.2v2.37.2Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-10doc add: renormalize is not idempotent for CRCRLFPhilip Oakley
Bug report https://lore.kernel.org/git/AM0PR02MB56357CC96B702244F3271014E8DC9@AM0PR02MB5635.eurprd02.prod.outlook.com/ noted that a file containing /r/r/n needed renormalising twice. This is by design. Lone CR characters, not paired with an LF, are left unchanged. Note this limitation of the "clean" filter in the documentation. Renormalize was introduced at 9472935d81e (add: introduce "--renormalize", Torsten Bögershausen, 2017-11-16) Signed-off-by: Philip Oakley <philipoakley@iee.email> Reviewed-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-05Downmerge a bit more for 2.37.xJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-05Merge branch 'sg/index-format-doc-update' into maintJunio C Hamano
Docfix. source: <20220718085640.7395-1-szeder.dev@gmail.com> * sg/index-format-doc-update: index-format.txt: remove outdated list of supported extensions
2022-08-05Merge branch 'ma/sparse-checkout-cone-doc-fix' into maintJunio C Hamano
Docfix. source: <20220718100530.2068354-1-martin.agren@gmail.com> * ma/sparse-checkout-cone-doc-fix: config/core.txt: fix minor issues for `core.sparseCheckoutCone`
2022-08-05Merge branch 'ds/doc-wo-whitelist' into maintJunio C Hamano
Avoid "white/black-list" in documentation and code comments. source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com> * ds/doc-wo-whitelist: transport.c: avoid "whitelist" t: avoid "whitelist" git.txt: remove redundant language git-cvsserver: clarify directory list daemon: clarify directory arguments
2022-08-05Merge branch 'mb/config-document-include' into maintJunio C Hamano
Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com> * mb/config-document-include: config.txt: document include, includeIf
2022-08-01Documentation/git-reflog: remove unneeded \ from \{Glen Choo
There are some inconsistencies with how different asciidoc environments handle different combinations of "\{<>}", e.g. these results were observed with asciidoc on two different environments: | Input | Output (env A) | Output (env B) | same/different | |-----------+----------------+------------------+----------------| | \{<foo>\} | {&lt;foo&gt;} | \{&lt;foo&gt;}^M | different | | {<foo>} | {&lt;foo&gt;} | {&lt;foo&gt;} | same | | \{<foo>} | {&lt;foo&gt;} | \{&lt;foo&gt;}^M | different | | \{foo\} | {foo} | {foo} | same | | \{\} | {} | \{}^M | different | | \{} | {} | {} | same | | {\} | {} | {} | same | The only instance of this biting us is "@\{<specifier>\}" in Documentation/git-reflog.txt; all other combinations of "\{<>}" (e.g. in Documentation/revisions.txt) seem to render consistently. Fix this inconsistent rendering by removing the unnecessary "\" in Documentation/git-reflog.txt. Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-27Downmerge a handful of fixes for 2.37.x maintenance trackJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-27Merge branch 'tk/rev-parse-doc-clarify-at-u' into maintJunio C Hamano
Doc update. source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com> * tk/rev-parse-doc-clarify-at-u: rev-parse: documentation adjustment - mention remote tracking with @{u}
2022-07-27Merge branch 'pb/diff-doc-raw-format' into maintJunio C Hamano
Update "git diff/log --raw" format documentation. source: <pull.1259.git.1655123383.gitgitgadget@gmail.com> * pb/diff-doc-raw-format: diff-index.txt: update raw output format in examples diff-format.txt: correct misleading wording diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
2022-07-27Merge branch 'jk/revisions-doc-markup-fix' into maintJunio C Hamano
Documentation mark-up fix. source: <YrOmsA04FZae89be@coredump.intra.peff.net> * jk/revisions-doc-markup-fix: revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis
2022-07-27Merge branch 'ac/bitmap-format-doc' into maintJunio C Hamano
Adjust technical/bitmap-format to be formatted by AsciiDoc, and add some missing information to the documentation. source: <pull.1246.v4.git.1655355834.gitgitgadget@gmail.com> * ac/bitmap-format-doc: bitmap-format.txt: add information for trailing checksum bitmap-format.txt: fix some formatting issues bitmap-format.txt: feed the file to asciidoc to generate html
2022-07-27Merge branch 'ds/git-rebase-doc-markup' into maintJunio C Hamano
References to commands-to-be-typed-literally in "git rebase" documentation mark-up have been corrected. source: <pull.1270.v3.git.1656508868146.gitgitgadget@gmail.com> * ds/git-rebase-doc-markup: git-rebase.txt: use back-ticks consistently
2022-07-19git.txt: remove redundant languageDerrick Stolee
The documentation for GIT_ALLOW_PROTOCOL has a sentence that adds no value, since it repeats the meaning from the previous sentence (twice!). The word "whitelist" has cultural implications that are not inclusive, which brought attention to this sentence. Helped-by: Jeff King <peff@peff.net> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.3-5-g9baa (git 2.53.0) at 2026-04-17 14:41:39 +0000