Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gt/add-u-commit-i-pathspec-check' | Junio C Hamano | 2024-04-15 | 3 | -4/+17 |
|\ | |||||
| * | builtin/add: error out when passing untracked path with -u | Ghanshyam Thakkar | 2024-04-03 | 1 | -1/+8 |
| * | builtin/commit: error out when passing untracked path with -i | Ghanshyam Thakkar | 2024-04-03 | 1 | -1/+6 |
| * | revision: optionally record matches with pathspec elements | Junio C Hamano | 2024-04-03 | 3 | -4/+5 |
* | | Merge branch 'ds/fetch-config-parse-microfix' | Junio C Hamano | 2024-04-15 | 1 | -0/+1 |
|\ \ | |||||
| * | | fetch: return when parsing submodule.recurse | Derrick Stolee | 2024-04-05 | 1 | -0/+1 |
* | | | Merge branch 'ma/win32-unix-domain-socket' | Junio C Hamano | 2024-04-15 | 2 | -0/+5 |
|\ \ \ | |||||
| * | | | Win32: detect unix socket support at runtime | Matthias Aßhauer | 2024-04-03 | 2 | -0/+5 |
* | | | | Merge branch 'jc/checkout-detach-wo-tracking-report' | Junio C Hamano | 2024-04-12 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | checkout: omit "tracking" information on a detached HEAD | Junio C Hamano | 2024-03-31 | 1 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'js/merge-tree-3-trees' | Junio C Hamano | 2024-04-12 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | merge-tree: fix argument type of the `--merge-base` option | Johannes Schindelin | 2024-04-12 | 1 | -1/+1 |
* | | | | | Merge branch 'kn/clarify-update-ref-doc' | Junio C Hamano | 2024-04-10 | 1 | -13/+13 |
|\ \ \ \ \ | |||||
| * | | | | | update-ref: use {old,new}-oid instead of {old,new}value | Karthik Nayak | 2024-04-02 | 1 | -13/+13 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rj/use-adv-if-enabled' | Junio C Hamano | 2024-04-09 | 1 | -11/+7 |
|\ \ \ \ \ | |||||
| * | | | | | add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO | Rubén Justo | 2024-03-31 | 1 | -3/+3 |
| * | | | | | add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC | Rubén Justo | 2024-03-31 | 1 | -4/+2 |
| * | | | | | add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE | Rubén Justo | 2024-03-31 | 1 | -4/+2 |
* | | | | | | Merge branch 'ps/pack-refs-auto' | Junio C Hamano | 2024-04-09 | 2 | -48/+69 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/gc: pack refs when using `git maintenance run --auto` | Patrick Steinhardt | 2024-03-25 | 1 | -1/+11 |
| * | | | | | | builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs | Patrick Steinhardt | 2024-03-25 | 1 | -9/+12 |
| * | | | | | | builtin/gc: move `struct maintenance_run_opts` | Patrick Steinhardt | 2024-03-25 | 1 | -27/+26 |
| * | | | | | | builtin/pack-refs: introduce new "--auto" flag | Patrick Steinhardt | 2024-03-25 | 1 | -1/+2 |
| * | | | | | | builtin/pack-refs: release allocated memory | Patrick Steinhardt | 2024-03-25 | 1 | -8/+15 |
| * | | | | | | refs: remove `PACK_REFS_ALL` flag | Patrick Steinhardt | 2024-03-25 | 1 | -2/+3 |
* | | | | | | | Merge branch 'jk/core-comment-string' | Junio C Hamano | 2024-04-05 | 9 | -38/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | prefer comment_line_str to comment_line_char for printing | Jeff King | 2024-03-12 | 4 | -14/+14 |
| * | | | | | | | strbuf: accept a comment string for strbuf_add_commented_lines() | Jeff King | 2024-03-12 | 2 | -5/+5 |
| * | | | | | | | strbuf: accept a comment string for strbuf_commented_addf() | Jeff King | 2024-03-12 | 3 | -7/+7 |
| * | | | | | | | strbuf: accept a comment string for strbuf_stripspace() | Jeff King | 2024-03-12 | 8 | -9/+9 |
| * | | | | | | | environment: store comment_line_char as a string | Jeff King | 2024-03-12 | 1 | -2/+2 |
| * | | | | | | | commit: refactor base-case of adjust_comment_line_char() | Jeff King | 2024-03-12 | 1 | -2/+3 |
* | | | | | | | | Merge branch 'rs/config-comment' | Junio C Hamano | 2024-04-05 | 4 | -12/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: allow tweaking whitespace between value and comment | Junio C Hamano | 2024-03-16 | 1 | -6/+1 |
| * | | | | | | | | config: fix --comment formatting | Junio C Hamano | 2024-03-16 | 1 | -4/+11 |
| * | | | | | | | | config: add --comment option to add a comment | Ralph Seichter | 2024-03-15 | 4 | -12/+20 |
* | | | | | | | | | Merge branch 'bl/cherry-pick-empty' | Junio C Hamano | 2024-04-03 | 2 | -7/+47 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cherry-pick: add `--empty` for more robust redundant commit handling | Brian Lyles | 2024-03-26 | 1 | -1/+36 |
| * | | | | | | | | | cherry-pick: enforce `--keep-redundant-commits` incompatibility | Brian Lyles | 2024-03-26 | 1 | -0/+1 |
| * | | | | | | | | | rebase: update `--empty=ask` to `--empty=stop` | Brian Lyles | 2024-03-26 | 1 | -6/+10 |
* | | | | | | | | | | Merge branch 'rs/strbuf-expand-bad-format' | Junio C Hamano | 2024-04-03 | 3 | -26/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cat-file: use strbuf_expand_bad_format() | René Scharfe | 2024-03-25 | 1 | -8/+8 |
| * | | | | | | | | | | factor out strbuf_expand_bad_format() | René Scharfe | 2024-03-25 | 2 | -18/+2 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/rebase-apply-leakfix' | Junio C Hamano | 2024-04-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase: use child_process_clear() to clean | Jeff King | 2024-03-22 | 1 | -3/+3 |
* | | | | | | | | | | | Merge branch 'pb/advice-merge-conflict' | Junio C Hamano | 2024-04-01 | 1 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | builtin/am: allow disabling conflict advice | Philippe Blain | 2024-03-18 | 1 | -5/+9 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/pretty-subject-cleanup' | Junio C Hamano | 2024-04-01 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | format-patch: return an allocated string from log_write_email_headers() | Jeff King | 2024-03-20 | 1 | -0/+1 |
| * | | | | | | | | | | | pretty: drop print_email_subject flag | Jeff King | 2024-03-20 | 2 | -1/+1 |