summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cirrus.yml9
-rw-r--r--.github/workflows/main.yml2
-rw-r--r--Documentation/RelNotes/2.34.0.txt102
-rw-r--r--Documentation/config.txt9
-rw-r--r--Documentation/git-bundle.txt147
-rw-r--r--Documentation/git-for-each-ref.txt9
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-pull.txt21
-rw-r--r--Documentation/git-rebase.txt29
-rw-r--r--Documentation/gitfaq.txt2
-rw-r--r--Documentation/merge-options.txt44
-rw-r--r--Documentation/merge-strategies.txt99
-rw-r--r--Documentation/rev-list-options.txt8
-rw-r--r--Documentation/technical/api-trace2.txt14
-rw-r--r--Documentation/technical/directory-rename-detection.txt14
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile13
l---------RelNotes2
-rw-r--r--advice.c5
-rw-r--r--advice.h1
-rw-r--r--apply.c1
-rw-r--r--bisect.c26
-rw-r--r--builtin/add.c15
-rw-r--r--builtin/commit.c5
-rw-r--r--builtin/credential-cache.c2
-rw-r--r--builtin/credential-store.c2
-rw-r--r--builtin/fetch.c4
-rw-r--r--builtin/gc.c93
-rw-r--r--builtin/log.c2
-rw-r--r--builtin/ls-remote.c2
-rw-r--r--builtin/merge.c22
-rw-r--r--builtin/pack-objects.c23
-rw-r--r--builtin/pull.c55
-rw-r--r--builtin/rebase.c4
-rw-r--r--builtin/revert.c3
-rw-r--r--builtin/send-pack.c1
-rw-r--r--builtin/tag.c2
-rw-r--r--cache.h4
-rw-r--r--commit-graph.c75
-rw-r--r--commit-graph.h8
-rw-r--r--compat/linux/procinfo.c55
-rw-r--r--compat/mmap.c7
-rw-r--r--compat/stub/procinfo.c11
-rw-r--r--config.c8
-rw-r--r--config.mak.uname3
-rw-r--r--connect.c2
-rw-r--r--connected.c1
-rw-r--r--contrib/completion/git-completion.bash14
-rw-r--r--contrib/completion/git-completion.tcsh5
-rw-r--r--credential.c1
-rw-r--r--diff-lib.c4
-rw-r--r--diffcore-rename.c68
-rw-r--r--diffcore.h3
-rw-r--r--fetch-pack.c10
-rw-r--r--http-push.c29
-rw-r--r--http-walker.c14
-rw-r--r--http.c169
-rw-r--r--http.h46
-rw-r--r--imap-send.c4
-rw-r--r--list-objects.c8
-rw-r--r--merge-ort.c188
-rw-r--r--path.c19
-rw-r--r--pathspec.c2
-rw-r--r--protocol.c2
-rw-r--r--quote.c17
-rw-r--r--quote.h1
-rw-r--r--range-diff.c29
-rw-r--r--ref-filter.c243
-rw-r--r--ref-filter.h9
-rw-r--r--remote-curl.c11
-rw-r--r--revision.c38
-rw-r--r--revision.h7
-rw-r--r--send-pack.c6
-rw-r--r--sequencer.c117
-rw-r--r--t/lib-rebase.sh56
-rwxr-xr-xt/t0060-path-utils.sh26
-rw-r--r--t/t0210/scrub_normal.perl6
-rw-r--r--t/t0211/scrub_perf.perl5
-rw-r--r--t/t0212/parse_events.perl5
-rwxr-xr-xt/t1092-sparse-checkout-compatibility.sh67
-rwxr-xr-xt/t1405-main-ref-store.sh18
-rwxr-xr-xt/t1410-reflog.sh4
-rwxr-xr-xt/t1503-rev-parse-verify.sh2
-rwxr-xr-xt/t2402-worktree-list.sh2
-rwxr-xr-xt/t3203-branch-output.sh4
-rwxr-xr-xt/t3320-notes-merge-worktrees.sh12
-rwxr-xr-xt/t3403-rebase-skip.sh13
-rwxr-xr-xt/t3404-rebase-interactive.sh13
-rwxr-xr-xt/t3418-rebase-continue.sh18
-rwxr-xr-xt/t3430-rebase-merges.sh38
-rwxr-xr-xt/t4013-diff-various.sh2
-rw-r--r--t/t4018/java-class-member-function4
-rw-r--r--t/t4018/java-enum-constant6
-rw-r--r--t/t4018/java-method-return-generic-bounded9
-rw-r--r--t/t4018/java-method-return-generic-wildcard9
-rw-r--r--t/t4018/java-nested-field6
-rwxr-xr-xt/t4045-diff-relative.sh53
-rwxr-xr-xt/t4103-apply-binary.sh23
-rwxr-xr-xt/t5300-pack-object.sh104
-rwxr-xr-xt/t5323-pack-redundant.sh4
-rwxr-xr-xt/t5510-fetch.sh13
-rwxr-xr-xt/t5516-fetch-push.sh4
-rwxr-xr-xt/t5520-pull.sh20
-rwxr-xr-xt/t5521-pull-options.sh4
-rwxr-xr-xt/t5524-pull-msg.sh4
-rwxr-xr-xt/t5549-fetch-push-http.sh72
-rwxr-xr-xt/t5553-set-upstream.sh14
-rwxr-xr-xt/t5582-fetch-negative-refspec.sh1
-rwxr-xr-xt/t5604-clone-reference.sh4
-rwxr-xr-xt/t5607-clone-bundle.sh5
-rwxr-xr-xt/t5702-protocol-v2.sh6
-rwxr-xr-xt/t5705-session-id-in-capabilities.sh11
-rwxr-xr-xt/t6000-rev-list-misc.sh31
-rwxr-xr-xt/t6001-rev-list-graft.sh3
-rwxr-xr-xt/t6050-replace.sh2
-rwxr-xr-xt/t6120-describe.sh6
-rwxr-xr-xt/t6300-for-each-ref.sh264
-rwxr-xr-xt/t6402-merge-rename.sh18
-rwxr-xr-xt/t6409-merge-subtree.sh6
-rwxr-xr-xt/t6417-merge-ours-theirs.sh10
-rwxr-xr-xt/t6500-gc.sh5
-rwxr-xr-xt/t7004-tag.sh4
-rwxr-xr-xt/t7030-verify-tag.sh4
-rwxr-xr-xt/t7064-wtstatus-pv2.sh5
-rwxr-xr-xt/t7500-commit-template-squash-signoff.sh9
-rwxr-xr-xt/t7601-merge-pull-config.sh244
-rwxr-xr-xt/t7603-merge-reduce-heads.sh2
-rwxr-xr-xt/t7900-maintenance.sh17
-rwxr-xr-xt/t9001-send-email.sh2
-rwxr-xr-xt/t9902-completion.sh15
-rw-r--r--trace2.c13
-rw-r--r--