summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gt/add-u-commit-i-pathspec-check'Junio C Hamano2024-04-153-4/+17
|\
| * builtin/add: error out when passing untracked path with -uGhanshyam Thakkar2024-04-031-1/+8
| * builtin/commit: error out when passing untracked path with -iGhanshyam Thakkar2024-04-031-1/+6
| * revision: optionally record matches with pathspec elementsJunio C Hamano2024-04-033-4/+5
* | Merge branch 'ds/fetch-config-parse-microfix'Junio C Hamano2024-04-151-0/+1
|\ \
| * | fetch: return when parsing submodule.recurseDerrick Stolee2024-04-051-0/+1
* | | Merge branch 'ma/win32-unix-domain-socket'Junio C Hamano2024-04-152-0/+5
|\ \ \
| * | | Win32: detect unix socket support at runtimeMatthias Aßhauer2024-04-032-0/+5
* | | | Merge branch 'jc/checkout-detach-wo-tracking-report'Junio C Hamano2024-04-121-1/+2
|\ \ \ \
| * | | | checkout: omit "tracking" information on a detached HEADJunio C Hamano2024-03-311-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-04-121-1/+1
|\ \ \ \
| * | | | merge-tree: fix argument type of the `--merge-base` optionJohannes Schindelin2024-04-121-1/+1
* | | | | Merge branch 'kn/clarify-update-ref-doc'Junio C Hamano2024-04-101-13/+13
|\ \ \ \ \
| * | | | | update-ref: use {old,new}-oid instead of {old,new}valueKarthik Nayak2024-04-021-13/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'rj/use-adv-if-enabled'Junio C Hamano2024-04-091-11/+7
|\ \ \ \ \
| * | | | | add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPORubén Justo2024-03-311-3/+3
| * | | | | add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPECRubén Justo2024-03-311-4/+2
| * | | | | add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILERubén Justo2024-03-311-4/+2
* | | | | | Merge branch 'ps/pack-refs-auto'Junio C Hamano2024-04-092-48/+69
|\ \ \ \ \ \
| * | | | | | builtin/gc: pack refs when using `git maintenance run --auto`Patrick Steinhardt2024-03-251-1/+11
| * | | | | | builtin/gc: forward git-gc(1)'s `--auto` flag when packing refsPatrick Steinhardt2024-03-251-9/+12
| * | | | | | builtin/gc: move `struct maintenance_run_opts`Patrick Steinhardt2024-03-251-27/+26
| * | | | | | builtin/pack-refs: introduce new "--auto" flagPatrick Steinhardt2024-03-251-1/+2
| * | | | | | builtin/pack-refs: release allocated memoryPatrick Steinhardt2024-03-251-8/+15
| * | | | | | refs: remove `PACK_REFS_ALL` flagPatrick Steinhardt2024-03-251-2/+3
* | | | | | | Merge branch 'jk/core-comment-string'Junio C Hamano2024-04-059-38/+39
|\ \ \ \ \ \ \
| * | | | | | | prefer comment_line_str to comment_line_char for printingJeff King2024-03-124-14/+14
| * | | | | | | strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King2024-03-122-5/+5
| * | | | | | | strbuf: accept a comment string for strbuf_commented_addf()Jeff King2024-03-123-7/+7
| * | | | | | | strbuf: accept a comment string for strbuf_stripspace()Jeff King2024-03-128-9/+9
| * | | | | | | environment: store comment_line_char as a stringJeff King2024-03-121-2/+2
| * | | | | | | commit: refactor base-case of adjust_comment_line_char()Jeff King2024-03-121-2/+3
* | | | | | | | Merge branch 'rs/config-comment'Junio C Hamano2024-04-054-12/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | config: allow tweaking whitespace between value and commentJunio C Hamano2024-03-161-6/+1
| * | | | | | | | config: fix --comment formattingJunio C Hamano2024-03-161-4/+11
| * | | | | | | | config: add --comment option to add a commentRalph Seichter2024-03-154-12/+20
* | | | | | | | | Merge branch 'bl/cherry-pick-empty'Junio C Hamano2024-04-032-7/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles2024-03-261-1/+36
| * | | | | | | | | cherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles2024-03-261-0/+1
| * | | | | | | | | rebase: update `--empty=ask` to `--empty=stop`Brian Lyles2024-03-261-6/+10
* | | | | | | | | | Merge branch 'rs/strbuf-expand-bad-format'Junio C Hamano2024-04-033-26/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cat-file: use strbuf_expand_bad_format()René Scharfe2024-03-251-8/+8
| * | | | | | | | | | factor out strbuf_expand_bad_format()René Scharfe2024-03-252-18/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/rebase-apply-leakfix'Junio C Hamano2024-04-011-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: use child_process_clear() to cleanJeff King2024-03-221-3/+3
* | | | | | | | | | | Merge branch 'pb/advice-merge-conflict'Junio C Hamano2024-04-011-5/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/am: allow disabling conflict advicePhilippe Blain2024-03-181-5/+9
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/pretty-subject-cleanup'Junio C Hamano2024-04-013-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: return an allocated string from log_write_email_headers()Jeff King2024-03-201-0/+1
| * | | | | | | | | | | pretty: drop print_email_subject flagJeff King2024-03-202-1/+1