summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.35.0.txt73
-rw-r--r--Documentation/config/gpg.txt4
-rw-r--r--Documentation/git-am.txt16
-rw-r--r--Documentation/git-apply.txt11
-rw-r--r--Documentation/git-clone.txt8
-rw-r--r--Documentation/git-fmt-merge-msg.txt6
-rw-r--r--Documentation/git-format-patch.txt6
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-repack.txt5
-rw-r--r--Documentation/git-sparse-checkout.txt100
-rw-r--r--apply.c10
-rw-r--r--apply.h1
-rw-r--r--builtin/am.c89
-rw-r--r--builtin/clean.c44
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/fast-export.c40
-rw-r--r--builtin/fetch.c10
-rw-r--r--builtin/fmt-merge-msg.c4
-rw-r--r--builtin/log.c1
-rw-r--r--builtin/merge.c4
-rw-r--r--builtin/prune.c20
-rw-r--r--builtin/receive-pack.c2
-rw-r--r--builtin/repack.c8
-rw-r--r--builtin/rm.c3
-rw-r--r--builtin/sparse-checkout.c209
-rw-r--r--builtin/stash.c4
-rw-r--r--cache.h2
-rw-r--r--common-main.c13
-rw-r--r--config.mak.dev5
-rwxr-xr-xcontrib/mw-to-git/t/t9365-continuing-queries.sh2
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh2
-rw-r--r--daemon.c2
-rw-r--r--diff.c431
-rw-r--r--dir.c21
-rw-r--r--dir.h9
-rw-r--r--environment.c9
-rw-r--r--fmt-merge-msg.c7
-rw-r--r--fmt-merge-msg.h1
-rw-r--r--git-compat-util.h13
-rwxr-xr-xgit-p4.py169
-rw-r--r--grep.c26
-rw-r--r--grep.h2
-rw-r--r--help.c2
-rw-r--r--object-file.c50
-rw-r--r--object-store.h26
-rw-r--r--object.c2
-rw-r--r--po/README.md4
-rw-r--r--refs.c2
-rw-r--r--repository.c2
-rw-r--r--repository.h1
-rw-r--r--revision.c4
-rw-r--r--revision.h2
-rw-r--r--sequencer.c2
-rw-r--r--setup.c65
-rw-r--r--symlinks.c8
-rw-r--r--t/Makefile10
-rw-r--r--t/annotate-tests.sh2
-rw-r--r--t/chainlint.sed124
-rw-r--r--t/chainlint/arithmetic-expansion.expect6
-rw-r--r--t/chainlint/bash-array.expect4
-rw-r--r--t/chainlint/blank-line.expect2
-rw-r--r--t/chainlint/blank-line.test2
-rw-r--r--t/chainlint/block-comment.expect6
-rw-r--r--t/chainlint/block-comment.test8
-rw-r--r--t/chainlint/block.expect4
-rw-r--r--t/chainlint/block.test3
-rw-r--r--t/chainlint/broken-chain.expect4
-rw-r--r--t/chainlint/broken-chain.test2
-rw-r--r--t/chainlint/case-comment.expect8
-rw-r--r--t/chainlint/case-comment.test11
-rw-r--r--t/chainlint/case.expect10
-rw-r--r--t/chainlint/case.test6
-rw-r--r--t/chainlint/close-nested-and-parent-together.expect5
-rw-r--r--t/chainlint/close-subshell.expect16
-rw-r--r--t/chainlint/command-substitution.expect6
-rw-r--r--t/chainlint/comment.expect2
-rw-r--r--t/chainlint/complex-if-in-cuddled-loop.expect5
-rw-r--r--t/chainlint/complex-if-in-cuddled-loop.test2
-rw-r--r--t/chainlint/cuddled-if-then-else.expect5
-rw-r--r--t/chainlint/cuddled-if-then-else.test2
-rw-r--r--t/chainlint/cuddled-loop.expect5
-rw-r--r--t/chainlint/cuddled-loop.test2
-rw-r--r--t/chainlint/cuddled.expect22
-rw-r--r--t/chainlint/cuddled.test3
-rw-r--r--t/chainlint/exit-loop.expect6
-rw-r--r--t/chainlint/exit-subshell.expect2
-rw-r--r--t/chainlint/for-loop.expect8
-rw-r--r--t/chainlint/for-loop.test8
-rw-r--r--t/chainlint/here-doc-close-subshell.expect2
-rw-r--r--t/chainlint/here-doc-multi-line-command-subst.expect6
-rw-r--r--t/chainlint/here-doc-multi-line-string.expect4
-rw-r--r--t/chainlint/here-doc.expect10
-rw-r--r--t/chainlint/here-doc.test7
-rw-r--r--t/chainlint/if-in-loop.expect8
-rw-r--r--t/chainlint/if-in-loop.test6
-rw-r--r--t/chainlint/if-then-else.expect15
-rw-r--r--t/chainlint/if-then-else.test17
-rw-r--r--t/chainlint/incomplete-line.expect2
-rw-r--r--t/chainlint/inline-comment.expect9
-rw-r--r--t/chainlint/loop-in-if.expect8
-rw-r--r--t/chainlint/loop-in-if.test6
-rw-r--r--t/chainlint/multi-line-nested-command-substitution.expect10
-rw-r--r--t/chainlint/multi-line-string.expect12
-rw-r--r--t/chainlint/multi-line-string.test16
-rw-r--r--t/chainlint/negated-one-liner.expect4
-rw-r--r--t/chainlint/nested-cuddled-subshell.expect14
-rw-r--r--t/chainlint/nested-here-doc.expect8
-rw-r--r--t/chainlint/nested-subshell-comment.expect6
-rw-r--r--t/chainlint/nested-subshell-comment.test2
-rw-r--r--t/chainlint/nested-subshell.expect6
-rw-r--r--t/chainlint/nested-subshell.test1
-rw-r--r--t/chainlint/not-heredoc.expect14
-rw-r--r--t/chainlint/not-heredoc.test16
-rw-r--r--t/chainlint/one-liner.expect6
-rw-r--r--t/chainlint/one-liner.test4
-rw-r--r--t/chainlint/p4-filespec.expect2
-rw-r--r--t/chainlint/pipe.expect4
-rw-r--r--t/chainlint/pipe.test2
-rw-r--r--t/chainlint/semicolon.expect27
-rw-r--r--t/chainlint/semicolon.test4
-rw-r--r--t/chainlint/subshell-here-doc.expect15
-rw-r--r--t/chainlint/subshell-here-doc.test8
-rw-r--r--t/chainlint/subshell-one-liner.expect12
-rw-r--r--t/chainlint/t7900-subtree.expect10
-rw-r--r--t/chainlint/t7900-subtree.test4
-rw-r--r--t/chainlint/while-loop.expect8
-rw-r--r--t/chainlint/while-loop.test8
-rw-r--r--t/helper/test-ref-store.c9
-rw-r--r--t/helper/test-trace2.c5
-rw-r--r--t/lib-pager.sh2