summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2023-08-04Git 2.42-rc0v2.42.0-rc0Junio C Hamano2-1/+24
2023-08-04Merge branch 'jc/branch-in-use-error-message'Junio C Hamano2-6/+6
2023-08-04Merge branch 'hy/blame-in-bare-with-contents'Junio C Hamano2-1/+12
2023-08-04Merge branch 'jc/parse-options-short-help'Junio C Hamano4-7/+21
2023-08-04Merge branch 'jc/doc-sent-patch-now-what'Junio C Hamano1-0/+32
2023-08-04Merge branch 'la/doc-choose-starting-point-fixup'Junio C Hamano1-4/+20
2023-08-04Merge branch 'pv/doc-submodule-update-settings'Junio C Hamano2-15/+22
2023-08-04Merge branch 'ja/worktree-orphan-fix'Junio C Hamano2-9/+9
2023-08-04Merge branch 'jc/retire-get-sha1-hex'Junio C Hamano4-7/+9
2023-08-04Merge branch 'la/doc-choose-starting-point'Junio C Hamano1-34/+77
2023-08-04docs: update when `git bisect visualize` uses `gitk`Matthias Aßhauer1-3/+8
2023-08-03compat/mingw: implement a native locate_in_PATH()Matthias Aßhauer2-0/+8
2023-08-03run-command: conditionally define locate_in_PATH()Matthias Aßhauer1-0/+2
2023-08-03rebase --skip: fix commit message clean up when skipping squashPhillip Wood4-39/+93
2023-08-02ident: don't consider '.' a crudbrian m. carlson3-4/+12
2023-08-02The eighteenth batchJunio C Hamano1-0/+19
2023-08-02Documentation/RelNotes/2.42.0.txt: typofixTaylor Blau1-1/+1
2023-08-02Merge branch 'ks/ref-filter-describe'Junio C Hamano3-0/+391
2023-08-02Merge branch 'ah/sequencer-rewrite-todo-fix'Junio C Hamano2-1/+27
2023-08-02Merge branch 'bb/use-trace2-counters-for-fsync-stats'Junio C Hamano6-26/+19
2023-08-02Merge branch 'ah/autoconf-fixes'Junio C Hamano1-1/+10
2023-08-02Merge branch 'jc/tree-walk-drop-base-offset'Junio C Hamano6-23/+23
2023-08-01avoid SHA-1 functions deprecated in OpenSSL 3+Eric Wong3-1/+63
2023-08-01sha256: avoid functions deprecated in OpenSSL 3+Eric Wong3-1/+57
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano7-82/+13
2023-07-31checkout/restore: add basic tests for --mergeJunio C Hamano2-0/+106
2023-07-31checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano5-5/+29
2023-07-31update-index: remove stale fallback code for "--unresolve"Junio C Hamano1-101/+11
2023-07-31update-index: use unmerge_index_entry() to support removalJunio C Hamano2-20/+55
2023-07-31resolve-undo: allow resurrecting conflicted state that resolved to deletionJunio C Hamano2-5/+44
2023-07-31update-index: do not read HEAD and MERGE_HEAD unconditionallyJunio C Hamano2-18/+36
2023-07-31doc: sha256 is no longer experimentalAdam Majer2-8/+11
2023-07-31sha256/gcrypt: die on gcry_md_open failuresEric Wong1-1/+3
2023-07-31sha256/gcrypt: fix memory leak with SHA-256 reposEric Wong1-0/+1
2023-07-31sha256/gcrypt: fix build with SANITIZE=leakEric Wong1-4/+4
2023-07-31bundle: use OPT_PASSTHRU_ARGVRené Scharfe2-23/+23
2023-07-28The seventeenth batchJunio C Hamano1-0/+3
2023-07-28Merge branch 'rs/pack-objects-parseopt-fix'Junio C Hamano4-7/+20
2023-07-28Merge branch 'rs/describe-parseopt-fix'Junio C Hamano2-3/+22
2023-07-28Merge branch 'bb/trace2-comment-fix'Junio C Hamano1-1/+1
2023-07-27MyFirstContribution: refrain from self-iterating too muchJunio C Hamano1-0/+32
2023-07-27The sixteenth batchJunio C Hamano1-0/+4
2023-07-27Merge branch 'jc/parse-options-reset'Junio C Hamano2-11/+28
2023-07-27Merge branch 'jc/parse-options-show-branch'Junio C Hamano2-11/+36
2023-07-27Merge branch 'jc/transport-parseopt-fix'Junio C Hamano5-12/+20
2023-07-27Merge branch 'jc/gitignore-doc-pattern-markup'Junio C Hamano1-1/+1
2023-07-27SubmittingPatches: use of older maintenance tracks is an exceptionJunio C Hamano1-6/+13
2023-07-27SubmittingPatches: explain why 'next' and above are inappropriate baseJunio C Hamano1-4/+8
2023-07-26t2400: rewrite regex to avoid unintentional PCREJacob Abel1-6/+6
2023-07-26builtin/worktree.c: convert tab in advice to spaceJacob Abel1-2/+2