Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rj/branch-edit-desc-unborn' into maint-2.38 | Junio C Hamano | 2022-10-27 | 1 | -2/+12 |
|\ | |||||
| * | branch: description for non-existent branch errors | Rubén Justo | 2022-10-07 | 1 | -2/+12 |
* | | Merge branch 'jk/cleanup-callback-parameters' into maint-2.38 | Junio C Hamano | 2022-10-25 | 2 | -5/+6 |
|\ \ | |||||
| * | | commit: avoid writing to global in option callback | Jeff King | 2022-10-06 | 1 | -2/+2 |
| * | | multi-pack-index: avoid writing to global in option callback | Jeff King | 2022-10-06 | 1 | -3/+4 |
| |/ | |||||
* | | Merge branch 'rs/gc-pack-refs-simplify' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -9/+2 |
|\ \ | |||||
| * | | gc: simplify maintenance_task_pack_refs() | René Scharfe | 2022-10-05 | 1 | -9/+2 |
| |/ | |||||
* | | Merge branch 'rs/bisect-start-leakfix' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -4/+3 |
|\ \ | |||||
| * | | bisect--helper: plug strvec leak | René Scharfe | 2022-10-07 | 1 | -4/+3 |
* | | | Merge branch 'jc/branch-description-unset' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | branch: do not fail a no-op --edit-desc | Junio C Hamano | 2022-09-30 | 1 | -2/+4 |
* | | | | Merge branch 'jk/fsck-on-diet' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | parse_object_buffer(): respect save_commit_buffer | Jeff King | 2022-09-22 | 1 | -3/+0 |
| * | | | | fsck: turn off save_commit_buffer | Jeff King | 2022-09-22 | 1 | -0/+1 |
| * | | | | fsck: free tree buffers after walking unreachable objects | Jeff King | 2022-09-22 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ah/fsmonitor-daemon-usage-non-l10n' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | fsmonitor--daemon: don't translate literal commands | Alex Henrie | 2022-09-21 | 1 | -2/+2 |
* | | | | | Merge branch 'jk/clone-allow-bare-and-o-together' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -3/+0 |
|\ \ \ \ \ | |||||
| * | | | | | clone: allow "--bare" with "-o" | Jeff King | 2022-09-22 | 1 | -3/+0 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/remote-rename-without-fetch-refspec' into maint-2.38 | Junio C Hamano | 2022-10-25 | 1 | -23/+25 |
|\ \ \ \ \ | |||||
| * | | | | | remote: handle rename of remote without fetch refspec | Jeff King | 2022-09-22 | 1 | -23/+25 |
| |/ / / / | |||||
* | | | | | Sync with 2.37.4 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Sync with 2.36.3 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Sync with 2.35.5 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Sync with 2.34.5 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | | |\ \ | |||||
| | | | * \ | Sync with 2.33.5 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | | | |\ \ | |||||
| | | | | * \ | Sync with 2.32.4 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | | | | |\ \ | |||||
| | | | | | * \ | Sync with 2.31.5 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | Sync with 2.30.6 | Taylor Blau | 2022-10-06 | 1 | -3/+5 |
| | | | | | | |\ \ | |||||
| | | | | | | | * | | builtin/clone.c: disallow `--local` clones with symlinks | Taylor Blau | 2022-10-01 | 1 | -3/+5 |
| | | | | | | | |/ | |||||
| * | | | | | | | | Merge branch 'en/merge-unstash-only-on-clean-merge' into maint | Junio C Hamano | 2022-09-13 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'sg/parse-options-subcommand' | Junio C Hamano | 2022-09-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gc: don't translate literal commands | Alex Henrie | 2022-09-21 | 1 | -3/+3 |
* | | | | | | | | | | | Merge branch 'vd/scalar-generalize-diagnose' | Junio C Hamano | 2022-09-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | builtin/diagnose.c: don't translate the two mode values | Alex Henrie | 2022-09-21 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'vd/scalar-to-main' | Junio C Hamano | 2022-09-19 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git help: special-case `scalar` | Johannes Schindelin | 2022-09-02 | 1 | -0/+2 |
* | | | | | | | | | | | | | Merge branch 'jk/list-objects-filter-cleanup' | Junio C Hamano | 2022-09-19 | 4 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | list-objects-filter: add and use initializers | Jeff King | 2022-09-12 | 4 | -6/+7 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'zh/ls-files-format' | Junio C Hamano | 2022-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | ls-files: fix black space in error message | ZheNing Hu | 2022-09-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'sy/mv-out-of-cone' | Junio C Hamano | 2022-09-19 | 1 | -27/+134 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | builtin/mv.c: fix possible segfault in add_slash() | Shaoxuan Yuan | 2022-09-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | mv: check overwrite for in-to-out move | Shaoxuan Yuan | 2022-08-10 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | advice.h: add advise_on_moving_dirty_path() | Shaoxuan Yuan | 2022-08-10 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | mv: cleanup empty WORKING_DIRECTORY | Shaoxuan Yuan | 2022-08-10 | 1 | -0/+27 |
| * | | | | | | | | | | | | | | mv: from in-cone to out-of-cone | Shaoxuan Yuan | 2022-08-10 | 1 | -9/+62 |
| * | | | | | | | | | | | | | | mv: remove BOTH from enum update_mode | Shaoxuan Yuan | 2022-08-10 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | mv: check if <destination> is a SKIP_WORKTREE_DIR | Shaoxuan Yuan | 2022-08-10 | 1 | -4/+14 |
| * | | | | | | | | | | | | | | mv: free the with_slash in check_dir_in_index() | Shaoxuan Yuan | 2022-08-10 | 1 | -4/+9 |