summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cirrus.yml9
-rw-r--r--.github/workflows/check-whitespace.yml26
-rw-r--r--.github/workflows/main.yml175
-rw-r--r--Documentation/CodingGuidelines45
-rw-r--r--Documentation/Makefile77
-rw-r--r--Documentation/MyFirstContribution.txt4
-rw-r--r--Documentation/RelNotes/1.6.0.3.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.txt2
-rw-r--r--Documentation/RelNotes/2.29.0.txt4
-rw-r--r--Documentation/RelNotes/2.33.0.txt279
-rw-r--r--Documentation/RelNotes/2.34.0.txt77
-rw-r--r--Documentation/RelNotes/2.8.0.txt2
-rw-r--r--Documentation/SubmittingPatches208
-rw-r--r--Documentation/config.txt9
-rw-r--r--Documentation/config/blame.txt2
-rw-r--r--Documentation/config/color.txt5
-rw-r--r--Documentation/config/diff.txt7
-rw-r--r--Documentation/config/fetch.txt3
-rw-r--r--Documentation/config/merge.txt12
-rw-r--r--Documentation/config/pack.txt23
-rw-r--r--Documentation/config/push.txt13
-rw-r--r--Documentation/config/sendemail.txt3
-rw-r--r--Documentation/config/submodule.txt5
-rw-r--r--Documentation/diff-options.txt16
-rw-r--r--Documentation/fetch-options.txt13
-rw-r--r--Documentation/git-bundle.txt147
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt28
-rw-r--r--Documentation/git-describe.txt14
-rw-r--r--Documentation/git-diff.txt10
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-for-each-ref.txt9
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-pack-objects.txt6
-rw-r--r--Documentation/git-pull.txt23
-rw-r--r--Documentation/git-push.txt4
-rw-r--r--Documentation/git-rebase.txt29
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-send-email.txt25
-rw-r--r--Documentation/git-worktree.txt6
-rw-r--r--Documentation/gitfaq.txt2
-rw-r--r--Documentation/gitignore.txt11
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/glossary-content.txt4
-rw-r--r--Documentation/merge-options.txt47
-rw-r--r--Documentation/merge-strategies.txt99
-rw-r--r--Documentation/rev-list-options.txt18
-rw-r--r--Documentation/revisions.txt23
-rw-r--r--Documentation/technical/api-trace2.txt18
-rw-r--r--Documentation/technical/directory-rename-detection.txt14
-rw-r--r--Documentation/technical/hash-function-transition.txt2
-rw-r--r--Documentation/technical/packfile-uri.txt15
-rw-r--r--Documentation/technical/partial-clone.txt6
-rw-r--r--Documentation/technical/protocol-v2.txt2
-rw-r--r--Documentation/technical/remembering-renames.txt671
-rw-r--r--Documentation/user-manual.txt4
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile55
l---------RelNotes2
-rw-r--r--add-patch.c1
-rw-r--r--advice.c5
-rw-r--r--advice.h2
-rw-r--r--apply.c7
-rw-r--r--archive.c2
-rw-r--r--attr.c2
-rw-r--r--bisect.c26
-rw-r--r--builtin/add.c18
-rw-r--r--builtin/am.c1
-rw-r--r--builtin/bisect--helper.c2
-rw-r--r--builtin/bundle.c74
-rw-r--r--builtin/cat-file.c10
-rw-r--r--builtin/check-ignore.c3
-rw-r--r--builtin/checkout--worker.c2
-rw-r--r--builtin/checkout.c8
-rw-r--r--builtin/clean.c6
-rw-r--r--builtin/clone.c11
-rw-r--r--builtin/commit.c40
-rw-r--r--builtin/credential-cache.c2
-rw-r--r--builtin/credential-store.c2
-rw-r--r--builtin/diff-index.c9
-rw-r--r--builtin/diff.c4
-rw-r--r--builtin/difftool.c5
-rw-r--r--builtin/fetch.c9
-rw-r--r--builtin/for-each-repo.c14
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/grep.c3
-rw-r--r--builtin/help.c17
-rw-r--r--builtin/index-pack.c4
-rw-r--r--builtin/log.c8
-rw-r--r--builtin/ls-files.c3
-rw-r--r--builtin/merge-ours.c4
-rw-r--r--builtin/merge-tree.c5
-rw-r--r--builtin/merge.c33
-rw-r--r--builtin/mktree.c2
-rw-r--r--builtin/multi-pack-index.c2
-rw-r--r--builtin/mv.c5
-rw-r--r--builtin/pack-objects.c23
-rw-r--r--builtin/pull.c81
-rw-r--r--builtin/push.c79
-rw-r--r--builtin/rebase.c5
-rw-r--r--builtin/receive-pack.c5
-rw-r--r--builtin/rerere.c4
-rw-r--r--builtin/rev-list.c33
-rw-r--r--builtin/rev-parse.c30
-rw-r--r--builtin/revert.c3
-rw-r--r--builtin/send-pack.c1
-rw-r--r--builtin/show-branch.c9
-rw-r--r--builtin/sparse-checkout.c10
-rw-r--r--builtin/stash.c9
-rw-r--r--builtin/submodule--helper.c426
-rw-r--r--builtin/tag.c2
-rw-r--r--builtin/worktree.c21
-rw-r--r--bulk-checkin.c3
-rw-r--r--bundle.c64
-rw-r--r--bundle.h21
-rw-r--r--cache-tree.c13
-rw-r--r--cache.h14
-rw-r--r--cbtree.c167
-rw-r--r--cbtree.h56
-rw-r--r--chunk-format.c12
-rwxr-xr-xci/install-dependencies.sh5
-rwxr-xr-xci/lib.sh1
-rw-r--r--combine-diff.c5
-rw-r--r--commit-graph.c90
-rw-r--r--commit-graph.h8
-rw-r--r--commit.c2
-rw-r--r--compat/linux/procinfo.c55
-rw-r--r--compat/mingw.c21
-rw-r--r--compat/stub/procinfo.c11
-rw-r--r--config.c22