summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/check-whitespace.yml71
-rw-r--r--.github/workflows/main.yml58
-rw-r--r--.gitignore1
-rw-r--r--Documentation/MyFirstContribution.txt7
-rw-r--r--Documentation/RelNotes/2.29.1.txt11
-rw-r--r--Documentation/RelNotes/2.29.2.txt12
-rw-r--r--Documentation/RelNotes/2.30.0.txt236
-rw-r--r--Documentation/SubmittingPatches43
-rw-r--r--Documentation/blame-options.txt9
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/config/advice.txt9
-rw-r--r--Documentation/config/checkout.txt21
-rw-r--r--Documentation/config/clone.txt4
-rw-r--r--Documentation/config/core.txt4
-rw-r--r--Documentation/config/format.txt7
-rw-r--r--Documentation/config/maintenance.txt43
-rw-r--r--Documentation/config/push.txt6
-rw-r--r--Documentation/diff-options.txt22
-rw-r--r--Documentation/git-am.txt2
-rw-r--r--Documentation/git-blame.txt4
-rw-r--r--Documentation/git-branch.txt8
-rw-r--r--Documentation/git-checkout.txt9
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-clone.txt5
-rw-r--r--Documentation/git-commit-graph.txt4
-rw-r--r--Documentation/git-commit.txt10
-rw-r--r--Documentation/git-diff-index.txt9
-rw-r--r--Documentation/git-diff-tree.txt7
-rw-r--r--Documentation/git-diff.txt36
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--Documentation/git-for-each-repo.txt59
-rw-r--r--Documentation/git-format-patch.txt10
-rw-r--r--Documentation/git-grep.txt6
-rw-r--r--Documentation/git-log.txt15
-rw-r--r--Documentation/git-ls-files.txt5
-rw-r--r--Documentation/git-ls-tree.txt3
-rw-r--r--Documentation/git-maintenance.txt147
-rw-r--r--Documentation/git-p4.txt2
-rw-r--r--Documentation/git-push.txt26
-rw-r--r--Documentation/git-rebase.txt2
-rw-r--r--Documentation/git-remote.txt11
-rw-r--r--Documentation/git-restore.txt4
-rw-r--r--Documentation/git-rev-parse.txt8
-rw-r--r--Documentation/git-revert.txt2
-rw-r--r--Documentation/git-send-email.txt4
-rw-r--r--Documentation/git-svn.txt4
-rw-r--r--Documentation/git-switch.txt3
-rw-r--r--Documentation/git-worktree.txt5
-rw-r--r--Documentation/gitattributes.txt3
-rw-r--r--Documentation/githooks.txt4
-rw-r--r--Documentation/gitk.txt20
-rw-r--r--Documentation/line-range-format.txt28
-rw-r--r--Documentation/line-range-options.txt15
-rw-r--r--Documentation/merge-options.txt11
-rw-r--r--Documentation/pretty-options.txt6
-rw-r--r--Documentation/signoff-option.txt18
-rw-r--r--Documentation/technical/directory-rename-detection.txt15
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile40
l---------RelNotes2
-rw-r--r--add-patch.c8
-rw-r--r--advice.c3
-rw-r--r--advice.h2
-rw-r--r--apply.c9
-rw-r--r--archive-tar.c3
-rw-r--r--archive.c26
-rw-r--r--archive.h1
-rw-r--r--bisect.c2
-rw-r--r--blame.c22
-rw-r--r--blame.h4
-rw-r--r--builtin.h1
-rw-r--r--builtin/am.c21
-rw-r--r--builtin/bisect--helper.c187
-rw-r--r--builtin/blame.c13
-rw-r--r--builtin/checkout-index.c16
-rw-r--r--builtin/checkout.c24
-rw-r--r--builtin/clone.c71
-rw-r--r--builtin/commit.c2
-rw-r--r--builtin/credential.c3
-rw-r--r--builtin/diff-index.c10
-rw-r--r--builtin/diff-tree.c17
-rw-r--r--builtin/diff.c49
-rw-r--r--builtin/fast-import.c32
-rw-r--r--builtin/for-each-repo.c58
-rw-r--r--builtin/gc.c621
-rw-r--r--builtin/grep.c11
-rw-r--r--builtin/log.c66
-rw-r--r--builtin/merge-tree.c1
-rw-r--r--builtin/merge.c28
-rw-r--r--builtin/pull.c2
-rw-r--r--builtin/push.c27
-rw-r--r--builtin/rebase.c35
-rw-r--r--builtin/remote.c49
-rw-r--r--builtin/rev-parse.c100
-rw-r--r--builtin/revert.c9
-rw-r--r--builtin/send-pack.c11
-rw-r--r--builtin/stash.c27
-rw-r--r--builtin/worktree.c5
-rw-r--r--command-list.txt1
-rw-r--r--commit-graph.c21
-rw-r--r--commit.c2
-rw-r--r--compat/bswap.h2
-rw-r--r--config.mak.dev4
-rw-r--r--contrib/completion/git-completion.bash163
-rw-r--r--contrib/completion/git-completion.zsh141
-rw-r--r--contrib/completion/git-prompt.sh12
-rwxr-xr-xcontrib/git-resurrect.sh13
-rw-r--r--diff-lib.c78
-rw-r--r--diff.c26
-rw-r--r--diff.h11
-rw-r--r--dir.c6
-rw-r--r--fmt-merge-msg.c4
-rwxr-xr-xgit-add--interactive.perl7
-rwxr-xr-xgit-bisect.sh81
-rw-r--r--git-compat-util.h12
-rwxr-xr-xgit-gui/git-gui.sh103
-rw-r--r--git-gui/lib/blame.tcl1
-rw-r--r--git-gui/lib/themed.tcl38
-rwxr-xr-xgit-p4.py4
-rwxr-xr-xgit-svn.perl2
-rw-r--r--git.c1
-rw-r--r--line-log.c2
-rw-r--r--log-tree.c2
-rw-r--r--log-tree.h1
-rw-r--r--merge-ort-wrappers.c62
-rw-r--r--merge-ort-wrappers.h25
-rw-r--r--merge-ort.c52
-rw-r--r--merge-ort.h58
-rw-r--r--midx.c21
-rw-r--r--object.c6
-rw-r--r--object.h5
-rw-r--r--oidset.c