summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'es/worktree-repair-both-moved'Junio C Hamano2021-01-071-1/+1
|\
| * worktree: teach `repair` to fix multi-directional breakageEric Sunshine2020-12-211-1/+1
* | Merge branch 'fc/pull-merge-rebase'Junio C Hamano2021-01-071-27/+43
|\ \
| * | pull: display default warning only when non-ffFelipe Contreras2020-12-161-2/+5
| * | pull: correct condition to trigger non-ff adviceJunio C Hamano2020-12-161-13/+19
| * | pull: get rid of unnecessary global variableJunio C Hamano2020-12-161-6/+5
| * | pull: give the advice for choosing rebase/merge much laterFelipe Contreras2020-12-141-14/+18
| * | pull: refactor fast-forward checkFelipe Contreras2020-12-141-11/+15
* | | Merge branch 'tb/pack-bitmap'Junio C Hamano2021-01-071-1/+0
|\ \ \
| * | | pack-bitmap-write: ignore BITMAP_FLAG_REUSEJeff King2020-12-081-1/+0
* | | | Merge branch 'ma/maintenance-crontab-fix'Junio C Hamano2020-12-231-4/+3
|\ \ \ \
| * | | | gc: fix handling of crontab magic markersMartin Ågren2020-12-211-4/+3
| | |_|/ | |/| |
* | | | Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2020-12-231-2/+4
|\ \ \ \
| * | | | checkout -p: handle tree arguments correctly againJohannes Schindelin2020-12-211-2/+4
* | | | | Merge branch 'jx/pack-redundant-on-single-pack'Junio C Hamano2020-12-231-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | pack-redundant: fix crash when one packfile in repoJiang Xin2020-12-171-0/+6
* | | | | Merge branch 'ab/unreachable-break'Junio C Hamano2020-12-191-1/+0
|\ \ \ \ \
| * | | | | style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason2020-12-161-1/+0
| |/ / / /
* | | | | Merge branch 'js/init-defaultbranch-advice'Junio C Hamano2020-12-193-5/+9
|\ \ \ \ \
| * | | | | get_default_branch_name(): prepare for showing some adviceJohannes Schindelin2020-12-142-4/+6
| * | | | | branch -m: allow renaming a yet-unborn branchJohannes Schindelin2020-12-141-1/+3
* | | | | | Merge branch 'tb/partial-clone-filters-fix'Junio C Hamano2020-12-181-4/+11
|\ \ \ \ \ \
| * | | | | | builtin/clone.c: don't ignore transport_fetch_refs() errorsTaylor Blau2020-12-031-4/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'tb/bugreport-no-localtime'Junio C Hamano2020-12-091-1/+2
|\ \ \ \ \ \
| * | | | | | builtin/bugreport.c: use thread-safe localtime_r()Taylor Blau2020-12-011-1/+2
* | | | | | | Merge branch 'rs/maintenance-run-outside-repo'Junio C Hamano2020-12-091-7/+0
|\ \ \ \ \ \ \
| * | | | | | | maintenance: fix SEGFAULT when no repositoryRafael Silva2020-11-301-7/+0
* | | | | | | | Merge branch 'ma/grep-init-default'Junio C Hamano2020-12-092-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: use designated initializers for `grep_defaults`Martin Ågren2020-11-212-2/+0
| * | | | | | | | grep: don't set up a "default" repo for grepMartin Ågren2020-11-212-2/+2
* | | | | | | | | Merge branch 'js/trace2-session-id'Junio C Hamano2020-12-091-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | receive-pack: log received client session IDJosh Steadmon2020-11-121-0/+7
| * | | | | | | | | receive-pack: advertise session ID in v0 capabilitiesJosh Steadmon2020-11-121-0/+8
* | | | | | | | | | Merge branch 'ds/maintenance-part-3'Junio C Hamano2020-12-091-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | maintenance: use 'git config --fixed-value'Derrick Stolee2020-11-261-2/+3
* | | | | | | | | | | Merge branch 'ds/config-literal-value'Junio C Hamano2020-12-093-21/+72
|\| | | | | | | | | |
| * | | | | | | | | | config: implement --fixed-value with --get*Derrick Stolee2020-11-251-5/+10
| * | | | | | | | | | config: plumb --fixed-value into config APIDerrick Stolee2020-11-251-5/+11
| * | | | | | | | | | config: add --fixed-value option, un-implementedDerrick Stolee2020-11-251-0/+36
| * | | | | | | | | | config: replace 'value_regex' with 'value_pattern'Derrick Stolee2020-11-251-6/+6
| * | | | | | | | | | config: convert multi_replace to flagsDerrick Stolee2020-11-253-7/+11
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ps/update-ref-multi-transaction'Junio C Hamano2020-12-091-1/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | update-ref: disallow "start" for ongoing transactionsPatrick Steinhardt2020-11-161-0/+2
| * | | | | | | | | update-ref: allow creation of multiple transactionsPatrick Steinhardt2020-11-161-1/+12
* | | | | | | | | | Merge branch 'tb/repack-simplify'Junio C Hamano2020-12-031-99/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/repack.c: don't move existing packs out of the wayTaylor Blau2020-11-171-89/+14
| * | | | | | | | | | builtin/repack.c: keep track of what pack-objects wroteTaylor Blau2020-11-171-1/+30
| * | | | | | | | | | repack: make "exts" array available outside cmd_repack()Jeff King2020-11-171-9/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano2020-12-031-12/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | pull: check for local submodule modifications with the right rangePhilippe Blain2020-11-171-1/+1