Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/csprng-mktemps' | Junio C Hamano | 2022-02-12 | 1 | -1/+1 |
|\ | |||||
| * | wrapper: add a helper to generate numbers from a CSPRNG | brian m. carlson | 2022-01-17 | 1 | -1/+1 |
* | | Merge branch 'jl/subtree-check-parents-argument-passing-fix' | Junio C Hamano | 2022-01-10 | 1 | -4/+3 |
|\ \ | |/ |/| | |||||
| * | subtree: fix argument handling in check_parents | James Limbouris | 2022-01-04 | 1 | -4/+3 |
* | | Merge branch 'es/test-chain-lint' | Junio C Hamano | 2022-01-04 | 2 | -2/+2 |
|\ \ | |||||
| * | | t6000-t9999: detect and signal failure within loop | Eric Sunshine | 2021-12-13 | 1 | -1/+1 |
| * | | tests: fix broken &&-chains in `$(...)` command substitutions | Eric Sunshine | 2021-12-13 | 1 | -1/+1 |
* | | | Merge branch 'js/scalar' | Junio C Hamano | 2021-12-22 | 7 | -0/+1266 |
|\ \ \ | |||||
| * | | | scalar: implement the `version` command | Johannes Schindelin | 2021-12-05 | 1 | -0/+39 |
| * | | | scalar: implement the `delete` command | Matthew John Cheetham | 2021-12-05 | 3 | -0/+80 |
| * | | | scalar: teach 'reconfigure' to optionally handle all registered enlistments | Johannes Schindelin | 2021-12-05 | 3 | -6/+67 |
| * | | | scalar: allow reconfiguring an existing enlistment | Johannes Schindelin | 2021-12-05 | 3 | -28/+67 |
| * | | | scalar: implement the `run` command | Derrick Stolee | 2021-12-05 | 2 | -0/+83 |
| * | | | scalar: teach 'clone' to support the --single-branch option | Johannes Schindelin | 2021-12-05 | 3 | -4/+23 |
| * | | | scalar: implement the `clone` subcommand | Johannes Schindelin | 2021-12-05 | 3 | -3/+262 |
| * | | | scalar: implement 'scalar list' | Derrick Stolee | 2021-12-05 | 2 | -1/+21 |
| * | | | scalar: let 'unregister' handle a deleted enlistment directory gracefully | Johannes Schindelin | 2021-12-05 | 2 | -0/+61 |
| * | | | scalar: 'unregister' stops background maintenance | Derrick Stolee | 2021-12-05 | 2 | -8/+50 |
| * | | | scalar: 'register' sets recommended config and starts maintenance | Derrick Stolee | 2021-12-05 | 2 | -1/+266 |
| * | | | scalar: create test infrastructure | Johannes Schindelin | 2021-12-05 | 3 | -3/+109 |
| * | | | scalar: start documenting the command | Johannes Schindelin | 2021-12-05 | 1 | -0/+38 |
| * | | | scalar: create a rudimentary executable | Johannes Schindelin | 2021-12-05 | 3 | -0/+72 |
| * | | | scalar: add a README with a roadmap | Johannes Schindelin | 2021-12-05 | 1 | -0/+82 |
| |/ / | |||||
* | | | Merge branch 'en/zdiff3' | Junio C Hamano | 2021-12-15 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | xdiff: implement a zealous diff3, or "zdiff3" | Phillip Wood | 2021-12-01 | 1 | -3/+3 |
| |/ / | |||||
* | | | Merge branch 'hn/reftable' | Junio C Hamano | 2021-12-15 | 2 | -3/+22 |
|\ \ \ | |||||
| * | | | reftable: utility functions | Han-Wen Nienhuys | 2021-10-08 | 2 | -3/+22 |
* | | | | Merge branch 'yn/complete-date-format-options' | Junio C Hamano | 2021-12-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | completion: add human and auto: date format | Yoichi Nakayama | 2021-11-26 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'bc/require-c99' | Junio C Hamano | 2021-12-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | git-compat-util: add a test balloon for C99 support | brian m. carlson | 2021-12-01 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/jump-merge-with-pathspec' | Junio C Hamano | 2021-12-10 | 2 | -1/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | git-jump: pass "merge" arguments to ls-files | Jeff King | 2021-11-09 | 2 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ab/sh-retire-helper-functions' | Junio C Hamano | 2021-11-30 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | git-sh-setup: remove "sane_grep", it's not needed anymore | Ævar Arnfjörð Bjarmason | 2021-10-22 | 1 | -1/+0 |
* | | | | | Merge branch 'tp/send-email-completion' | Junio C Hamano | 2021-11-30 | 1 | -10/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | send-email: programmatically generate bash completions | Thiago Perrotta | 2021-10-28 | 1 | -10/+1 |
* | | | | | Merge branch 're/completion-fix-test-equality' | Junio C Hamano | 2021-10-30 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | completion: fix incorrect bash/zsh string equality check | Robert Estelle | 2021-10-28 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'rs/xopen-reports-open-failures' into maint | Junio C Hamano | 2021-10-12 | 1 | -0/+16 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ti/tcsh-completion-regression-fix' into maint | Junio C Hamano | 2021-10-12 | 1 | -2/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'fc/completion-updates' into maint | Junio C Hamano | 2021-10-12 | 1 | -7/+7 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'js/retire-preserve-merges' | Junio C Hamano | 2021-10-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: remove support for `--rebase=preserve` | Johannes Schindelin | 2021-09-08 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ab/help-config-vars' | Junio C Hamano | 2021-10-14 | 1 | -11/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | help / completion: make "git help" do the hard work | Ævar Arnfjörð Bjarmason | 2021-09-23 | 1 | -11/+10 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'ab/config-based-hooks-1' | Junio C Hamano | 2021-10-14 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | hook-list.h: add a generated list of hooks, like config-list.h | Ævar Arnfjörð Bjarmason | 2021-09-27 | 1 | -0/+7 |
* | | | | | | | Merge branch 'en/removing-untracked-fixes' | Junio C Hamano | 2021-10-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Comment important codepaths regarding nuking untracked files/dirs | Elijah Newren | 2021-09-27 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | |