Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'es/worktree-repair-both-moved' | Junio C Hamano | 2021-01-07 | 1 | -1/+1 |
|\ | |||||
| * | worktree: teach `repair` to fix multi-directional breakage | Eric Sunshine | 2020-12-21 | 1 | -1/+1 |
* | | Merge branch 'fc/pull-merge-rebase' | Junio C Hamano | 2021-01-07 | 1 | -27/+43 |
|\ \ | |||||
| * | | pull: display default warning only when non-ff | Felipe Contreras | 2020-12-16 | 1 | -2/+5 |
| * | | pull: correct condition to trigger non-ff advice | Junio C Hamano | 2020-12-16 | 1 | -13/+19 |
| * | | pull: get rid of unnecessary global variable | Junio C Hamano | 2020-12-16 | 1 | -6/+5 |
| * | | pull: give the advice for choosing rebase/merge much later | Felipe Contreras | 2020-12-14 | 1 | -14/+18 |
| * | | pull: refactor fast-forward check | Felipe Contreras | 2020-12-14 | 1 | -11/+15 |
* | | | Merge branch 'tb/pack-bitmap' | Junio C Hamano | 2021-01-07 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | pack-bitmap-write: ignore BITMAP_FLAG_REUSE | Jeff King | 2020-12-08 | 1 | -1/+0 |
* | | | | Merge branch 'ma/maintenance-crontab-fix' | Junio C Hamano | 2020-12-23 | 1 | -4/+3 |
|\ \ \ \ | |||||
| * | | | | gc: fix handling of crontab magic markers | Martin Ågren | 2020-12-21 | 1 | -4/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'dl/checkout-p-merge-base' | Junio C Hamano | 2020-12-23 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | checkout -p: handle tree arguments correctly again | Johannes Schindelin | 2020-12-21 | 1 | -2/+4 |
* | | | | | Merge branch 'jx/pack-redundant-on-single-pack' | Junio C Hamano | 2020-12-23 | 1 | -0/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | pack-redundant: fix crash when one packfile in repo | Jiang Xin | 2020-12-17 | 1 | -0/+6 |
* | | | | | Merge branch 'ab/unreachable-break' | Junio C Hamano | 2020-12-19 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | style: do not "break" in switch() after "return" | Ævar Arnfjörð Bjarmason | 2020-12-16 | 1 | -1/+0 |
| |/ / / / | |||||
* | | | | | Merge branch 'js/init-defaultbranch-advice' | Junio C Hamano | 2020-12-19 | 3 | -5/+9 |
|\ \ \ \ \ | |||||
| * | | | | | get_default_branch_name(): prepare for showing some advice | Johannes Schindelin | 2020-12-14 | 2 | -4/+6 |
| * | | | | | branch -m: allow renaming a yet-unborn branch | Johannes Schindelin | 2020-12-14 | 1 | -1/+3 |
* | | | | | | Merge branch 'tb/partial-clone-filters-fix' | Junio C Hamano | 2020-12-18 | 1 | -4/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/clone.c: don't ignore transport_fetch_refs() errors | Taylor Blau | 2020-12-03 | 1 | -4/+11 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'tb/bugreport-no-localtime' | Junio C Hamano | 2020-12-09 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin/bugreport.c: use thread-safe localtime_r() | Taylor Blau | 2020-12-01 | 1 | -1/+2 |
* | | | | | | | Merge branch 'rs/maintenance-run-outside-repo' | Junio C Hamano | 2020-12-09 | 1 | -7/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | maintenance: fix SEGFAULT when no repository | Rafael Silva | 2020-11-30 | 1 | -7/+0 |
* | | | | | | | | Merge branch 'ma/grep-init-default' | Junio C Hamano | 2020-12-09 | 2 | -2/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | grep: use designated initializers for `grep_defaults` | Martin Ågren | 2020-11-21 | 2 | -2/+0 |
| * | | | | | | | | grep: don't set up a "default" repo for grep | Martin Ågren | 2020-11-21 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'js/trace2-session-id' | Junio C Hamano | 2020-12-09 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | receive-pack: log received client session ID | Josh Steadmon | 2020-11-12 | 1 | -0/+7 |
| * | | | | | | | | | receive-pack: advertise session ID in v0 capabilities | Josh Steadmon | 2020-11-12 | 1 | -0/+8 |
* | | | | | | | | | | Merge branch 'ds/maintenance-part-3' | Junio C Hamano | 2020-12-09 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | maintenance: use 'git config --fixed-value' | Derrick Stolee | 2020-11-26 | 1 | -2/+3 |
* | | | | | | | | | | | Merge branch 'ds/config-literal-value' | Junio C Hamano | 2020-12-09 | 3 | -21/+72 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | config: implement --fixed-value with --get* | Derrick Stolee | 2020-11-25 | 1 | -5/+10 |
| * | | | | | | | | | | config: plumb --fixed-value into config API | Derrick Stolee | 2020-11-25 | 1 | -5/+11 |
| * | | | | | | | | | | config: add --fixed-value option, un-implemented | Derrick Stolee | 2020-11-25 | 1 | -0/+36 |
| * | | | | | | | | | | config: replace 'value_regex' with 'value_pattern' | Derrick Stolee | 2020-11-25 | 1 | -6/+6 |
| * | | | | | | | | | | config: convert multi_replace to flags | Derrick Stolee | 2020-11-25 | 3 | -7/+11 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ps/update-ref-multi-transaction' | Junio C Hamano | 2020-12-09 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | update-ref: disallow "start" for ongoing transactions | Patrick Steinhardt | 2020-11-16 | 1 | -0/+2 |
| * | | | | | | | | | update-ref: allow creation of multiple transactions | Patrick Steinhardt | 2020-11-16 | 1 | -1/+12 |
* | | | | | | | | | | Merge branch 'tb/repack-simplify' | Junio C Hamano | 2020-12-03 | 1 | -99/+54 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/repack.c: don't move existing packs out of the way | Taylor Blau | 2020-11-17 | 1 | -89/+14 |
| * | | | | | | | | | | builtin/repack.c: keep track of what pack-objects wrote | Taylor Blau | 2020-11-17 | 1 | -1/+30 |
| * | | | | | | | | | | repack: make "exts" array available outside cmd_repack() | Jeff King | 2020-11-17 | 1 | -9/+10 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'pb/pull-rebase-recurse-submodules' | Junio C Hamano | 2020-12-03 | 1 | -12/+36 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | pull: check for local submodule modifications with the right range | Philippe Blain | 2020-11-17 | 1 | -1/+1 |