summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/check-whitespace.yml5
-rw-r--r--.github/workflows/main.yml27
-rw-r--r--.travis.yml60
-rw-r--r--Documentation/CodingGuidelines27
-rw-r--r--Documentation/MyFirstObjectWalk.txt31
-rw-r--r--Documentation/RelNotes/2.35.0.txt349
-rw-r--r--Documentation/RelNotes/2.35.1.txt6
-rw-r--r--Documentation/RelNotes/2.36.0.txt34
-rw-r--r--Documentation/SubmittingPatches53
-rw-r--r--Documentation/config.txt23
-rw-r--r--Documentation/config/branch.txt3
-rw-r--r--Documentation/config/gpg.txt9
-rw-r--r--Documentation/config/grep.txt3
-rw-r--r--Documentation/config/merge.txt9
-rw-r--r--Documentation/config/user.txt17
-rw-r--r--Documentation/date-formats.txt6
-rw-r--r--Documentation/git-am.txt16
-rw-r--r--Documentation/git-apply.txt11
-rw-r--r--Documentation/git-archimport.txt14
-rw-r--r--Documentation/git-branch.txt24
-rw-r--r--Documentation/git-checkout.txt41
-rw-r--r--Documentation/git-cherry-pick.txt6
-rw-r--r--Documentation/git-clone.txt16
-rw-r--r--Documentation/git-config.txt46
-rw-r--r--Documentation/git-credential.txt2
-rw-r--r--Documentation/git-cvsexportcommit.txt4
-rw-r--r--Documentation/git-cvsimport.txt8
-rw-r--r--Documentation/git-diff-files.txt2
-rw-r--r--Documentation/git-diff-index.txt2
-rw-r--r--Documentation/git-diff-tree.txt2
-rw-r--r--Documentation/git-fmt-merge-msg.txt6
-rw-r--r--Documentation/git-format-patch.txt6
-rw-r--r--Documentation/git-fsck.txt2
-rw-r--r--Documentation/git-gui.txt2
-rw-r--r--Documentation/git-help.txt6
-rw-r--r--Documentation/git-http-fetch.txt2
-rw-r--r--Documentation/git-http-push.txt15
-rw-r--r--Documentation/git-init-db.txt2
-rw-r--r--Documentation/git-init.txt27
-rw-r--r--Documentation/git-log.txt8
-rw-r--r--Documentation/git-ls-files.txt11
-rw-r--r--Documentation/git-merge-file.txt3
-rw-r--r--Documentation/git-merge-index.txt2
-rw-r--r--Documentation/git-merge.txt40
-rw-r--r--Documentation/git-p4.txt8
-rw-r--r--Documentation/git-pack-objects.txt4
-rw-r--r--Documentation/git-pack-redundant.txt2
-rw-r--r--Documentation/git-rebase.txt6
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-remote.txt8
-rw-r--r--Documentation/git-repack.txt5
-rw-r--r--Documentation/git-request-pull.txt8
-rw-r--r--Documentation/git-restore.txt3
-rw-r--r--Documentation/git-shortlog.txt8
-rw-r--r--Documentation/git-sparse-checkout.txt102
-rw-r--r--Documentation/git-stage.txt2
-rw-r--r--Documentation/git-svn.txt2
-rw-r--r--Documentation/git-switch.txt5
-rw-r--r--Documentation/git-var.txt3
-rw-r--r--Documentation/git-web--browse.txt2
-rw-r--r--Documentation/git-worktree.txt2
-rw-r--r--Documentation/git.txt5
-rw-r--r--Documentation/gitcredentials.txt4
-rw-r--r--Documentation/gitsubmodules.txt2
-rw-r--r--Documentation/gitworkflows.txt6
-rw-r--r--Documentation/pretty-formats.txt68
-rw-r--r--Documentation/rev-list-options.txt2
-rw-r--r--Documentation/technical/multi-pack-index.txt17
-rw-r--r--Documentation/technical/protocol-v2.txt6
-rw-r--r--Documentation/technical/rerere.txt10
-rw-r--r--Documentation/urls-remotes.txt8
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile82
-rw-r--r--README.md2
l---------RelNotes2
-rw-r--r--add-patch.c4
-rw-r--r--apply.c64
-rw-r--r--apply.h27
-rw-r--r--archive-tar.c9
-rw-r--r--archive.c8
-rw-r--r--branch.c237
-rw-r--r--branch.h3
-rw-r--r--builtin/add.c21
-rw-r--r--builtin/am.c95
-rw-r--r--builtin/blame.c3
-rw-r--r--builtin/branch.c15
-rw-r--r--builtin/checkout.c111
-rw-r--r--builtin/clean.c44
-rw-r--r--builtin/clone.c10
-rw-r--r--builtin/commit.c17
-rw-r--r--builtin/credential.c2
-rw-r--r--builtin/describe.c6
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/diff.c5
-rw-r--r--builtin/difftool.c18
-rw-r--r--builtin/fast-export.c44
-rw-r--r--builtin/fast-import.c12
-rw-r--r--builtin/fetch.c156
-rw-r--r--builtin/fmt-merge-msg.c4
-rw-r--r--builtin/fsck.c12
-rw-r--r--builtin/gc.c14
-rw-r--r--builtin/help.c3
-rw-r--r--builtin/index-pack.c4
-rw-r--r--builtin/init-db.c2
-rw-r--r--builtin/log.c32
-rw-r--r--builtin/ls-files.c14
-rw-r--r--builtin/merge-file.c2
-rw-r--r--builtin/merge.c11
-rw-r--r--builtin/name-rev.c17
-rw-r--r--builtin/notes.c20
-rw-r--r--builtin/pack-objects.c4
-rw-r--r--builtin/prune.c20
-rw-r--r--builtin/pull.c11
-rw-r--r--builtin/push.c8
-rw-r--r--builtin/rebase.c10
-rw-r--r--builtin/receive-pack.c215
-rw-r--r--builtin/reflog.c223
-rw-r--r--builtin/repack.c14
-rw-r--r--builtin/replace.c3
-rw-r--r--builtin/reset.c123
-rw-r--r--builtin/rev-list.c4
-rw-r--r--builtin/rm.c7
-rw-r--r--builtin/show-branch.c16
-rw-r--r--builtin/sparse-checkout.c209
-rw-r--r--builtin/stash.c26
-rw-r--r--builtin/submodule--helper.c25
-rw-r--r--builtin/tag.c27
-rw-r--r--builtin/upload-archive.c5
-rw-r--r--builtin/var.c7
-rw-r--r--builtin/worktree.c33
-rw-r--r--