summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/branch-edit-desc-unborn' into maint-2.38Junio C Hamano2022-10-271-2/+12
|\
| * branch: description for non-existent branch errorsRubén Justo2022-10-071-2/+12
* | Merge branch 'jk/cleanup-callback-parameters' into maint-2.38Junio C Hamano2022-10-252-5/+6
|\ \
| * | commit: avoid writing to global in option callbackJeff King2022-10-061-2/+2
| * | multi-pack-index: avoid writing to global in option callbackJeff King2022-10-061-3/+4
| |/
* | Merge branch 'rs/gc-pack-refs-simplify' into maint-2.38Junio C Hamano2022-10-251-9/+2
|\ \
| * | gc: simplify maintenance_task_pack_refs()René Scharfe2022-10-051-9/+2
| |/
* | Merge branch 'rs/bisect-start-leakfix' into maint-2.38Junio C Hamano2022-10-251-4/+3
|\ \
| * | bisect--helper: plug strvec leakRené Scharfe2022-10-071-4/+3
* | | Merge branch 'jc/branch-description-unset' into maint-2.38Junio C Hamano2022-10-251-2/+4
|\ \ \
| * | | branch: do not fail a no-op --edit-descJunio C Hamano2022-09-301-2/+4
* | | | Merge branch 'jk/fsck-on-diet' into maint-2.38Junio C Hamano2022-10-251-3/+3
|\ \ \ \
| * | | | parse_object_buffer(): respect save_commit_bufferJeff King2022-09-221-3/+0
| * | | | fsck: turn off save_commit_bufferJeff King2022-09-221-0/+1
| * | | | fsck: free tree buffers after walking unreachable objectsJeff King2022-09-221-0/+2
| | |/ / | |/| |
* | | | Merge branch 'ah/fsmonitor-daemon-usage-non-l10n' into maint-2.38Junio C Hamano2022-10-251-2/+2
|\ \ \ \
| * | | | fsmonitor--daemon: don't translate literal commandsAlex Henrie2022-09-211-2/+2
* | | | | Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38Junio C Hamano2022-10-251-3/+0
|\ \ \ \ \
| * | | | | clone: allow "--bare" with "-o"Jeff King2022-09-221-3/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/remote-rename-without-fetch-refspec' into maint-2.38Junio C Hamano2022-10-251-23/+25
|\ \ \ \ \
| * | | | | remote: handle rename of remote without fetch refspecJeff King2022-09-221-23/+25
| |/ / / /
* | | | | Sync with 2.37.4Taylor Blau2022-10-061-3/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Sync with 2.36.3Taylor Blau2022-10-061-3/+5
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Sync with 2.35.5Taylor Blau2022-10-061-3/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Sync with 2.34.5Taylor Blau2022-10-061-3/+5
| | | |\ \
| | | | * \ Sync with 2.33.5Taylor Blau2022-10-061-3/+5
| | | | |\ \
| | | | | * \ Sync with 2.32.4Taylor Blau2022-10-061-3/+5
| | | | | |\ \
| | | | | | * \ Sync with 2.31.5Taylor Blau2022-10-061-3/+5
| | | | | | |\ \
| | | | | | | * \ Sync with 2.30.6Taylor Blau2022-10-061-3/+5
| | | | | | | |\ \
| | | | | | | | * | builtin/clone.c: disallow `--local` clones with symlinksTaylor Blau2022-10-011-3/+5
| | | | | | | | |/
| * | | | | | | | Merge branch 'en/merge-unstash-only-on-clean-merge' into maintJunio C Hamano2022-09-131-1/+4
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'sg/parse-options-subcommand'Junio C Hamano2022-09-211-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc: don't translate literal commandsAlex Henrie2022-09-211-3/+3
* | | | | | | | | | | Merge branch 'vd/scalar-generalize-diagnose'Junio C Hamano2022-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/diagnose.c: don't translate the two mode valuesAlex Henrie2022-09-211-1/+1
* | | | | | | | | | | | Merge branch 'vd/scalar-to-main'Junio C Hamano2022-09-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git help: special-case `scalar`Johannes Schindelin2022-09-021-0/+2
* | | | | | | | | | | | | Merge branch 'jk/list-objects-filter-cleanup'Junio C Hamano2022-09-194-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | list-objects-filter: add and use initializersJeff King2022-09-124-6/+7
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zh/ls-files-format'Junio C Hamano2022-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: fix black space in error messageZheNing Hu2022-09-121-1/+1
* | | | | | | | | | | | | | Merge branch 'sy/mv-out-of-cone'Junio C Hamano2022-09-191-27/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | builtin/mv.c: fix possible segfault in add_slash()Shaoxuan Yuan2022-09-091-1/+1
| * | | | | | | | | | | | | | mv: check overwrite for in-to-out moveShaoxuan Yuan2022-08-101-0/+12
| * | | | | | | | | | | | | | advice.h: add advise_on_moving_dirty_path()Shaoxuan Yuan2022-08-101-0/+3
| * | | | | | | | | | | | | | mv: cleanup empty WORKING_DIRECTORYShaoxuan Yuan2022-08-101-0/+27
| * | | | | | | | | | | | | | mv: from in-cone to out-of-coneShaoxuan Yuan2022-08-101-9/+62
| * | | | | | | | | | | | | | mv: remove BOTH from enum update_modeShaoxuan Yuan2022-08-101-1/+0
| * | | | | | | | | | | | | | mv: check if <destination> is a SKIP_WORKTREE_DIRShaoxuan Yuan2022-08-101-4/+14
| * | | | | | | | | | | | | | mv: free the with_slash in check_dir_in_index()Shaoxuan Yuan2022-08-101-4/+9