Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | usage.c: add a non-fatal bug() function to go with BUG() | Ævar Arnfjörð Bjarmason | 2022-06-02 | 2 | -2/+103 |
* | Merge branch 'js/use-builtin-add-i' | Junio C Hamano | 2022-05-31 | 2 | -21/+23 |
|\ | |||||
| * | add -i: default to the built-in implementation | Johannes Schindelin | 2021-12-01 | 2 | -2/+2 |
| * | t2016: require the PERL prereq only when necessary | Johannes Schindelin | 2021-12-01 | 1 | -20/+22 |
* | | Merge branch 'jc/t6424-failing-merge-preserve-local-changes' | Junio C Hamano | 2022-05-31 | 1 | -2/+30 |
|\ \ | |||||
| * | | t6424: make sure a failed merge preserves local changes | Junio C Hamano | 2022-05-19 | 1 | -2/+30 |
* | | | Merge branch 'cc/http-curlopt-resolve' | Junio C Hamano | 2022-05-31 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | http: add custom hostname to IP address resolutions | Christian Couder | 2022-05-16 | 1 | -0/+7 |
* | | | | Merge branch 'ac/remote-v-with-object-list-filters' | Junio C Hamano | 2022-05-26 | 1 | -0/+34 |
|\ \ \ \ | |||||
| * | | | | builtin/remote.c: teach `-v` to list filters for promisor remotes | Abhradeep Chakraborty | 2022-05-09 | 1 | -0/+34 |
| |/ / / | |||||
* | | | | Merge branch 'cb/path-owner-check-with-sudo' | Junio C Hamano | 2022-05-26 | 2 | -0/+121 |
|\ \ \ \ | |||||
| * | | | | t0034: add negative tests and allow git init to mostly work under sudo | Carlo Marcelo Arenas Belón | 2022-05-13 | 2 | -0/+77 |
| * | | | | git-compat-util: avoid failing dir ownership checks if running privileged | Carlo Marcelo Arenas Belón | 2022-05-13 | 1 | -1/+1 |
| * | | | | t: regression git needs safe.directory when using sudo | Carlo Marcelo Arenas Belón | 2022-05-13 | 1 | -0/+44 |
* | | | | | Merge branch 'tk/simple-autosetupmerge' | Junio C Hamano | 2022-05-26 | 3 | -4/+125 |
|\ \ \ \ \ | |||||
| * | | | | | push: new config option "push.autoSetupRemote" supports "simple" push | Tao Klerks | 2022-04-29 | 1 | -0/+14 |
| * | | | | | push: default to single remote even when not named origin | Tao Klerks | 2022-04-29 | 2 | -4/+76 |
| * | | | | | branch: new autosetupmerge option 'simple' for matching branches | Tao Klerks | 2022-04-29 | 1 | -0/+35 |
* | | | | | | Merge branch 'jc/avoid-redundant-submodule-fetch' | Junio C Hamano | 2022-05-26 | 1 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: do not run a redundant fetch from submodule | Junio C Hamano | 2022-05-18 | 1 | -0/+27 |
* | | | | | | | Merge branch 'jc/show-branch-g-current' | Junio C Hamano | 2022-05-26 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | show-branch: -g and --current are incompatible | Junio C Hamano | 2022-04-21 | 1 | -0/+14 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ab/valgrind-fixes' | Junio C Hamano | 2022-05-23 | 5 | -10/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | object-file: fix a unpack_loose_header() regression in 3b6a8db3b03 | Ævar Arnfjörð Bjarmason | 2022-05-13 | 2 | -4/+19 |
| * | | | | | | | log test: skip a failing mkstemp() test under valgrind | Ævar Arnfjörð Bjarmason | 2022-05-13 | 1 | -4/+7 |
| * | | | | | | | tests: using custom GIT_EXEC_PATH breaks --valgrind tests | Ævar Arnfjörð Bjarmason | 2022-05-13 | 2 | -2/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ab/commit-plug-leaks' | Junio C Hamano | 2022-05-23 | 2 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: fix "author_ident" leak | Junio C Hamano | 2022-05-13 | 2 | -0/+2 |
* | | | | | | | | Merge branch 'tk/p4-metadata-coding-strategies' | Junio C Hamano | 2022-05-21 | 3 | -1/+429 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: improve encoding handling to support inconsistent encodings | Tao Klerks | 2022-05-04 | 3 | -1/+429 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ds/sparse-colon-path' | Junio C Hamano | 2022-05-21 | 1 | -0/+36 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rev-parse: integrate with sparse index | Derrick Stolee | 2022-04-26 | 1 | -20/+25 |
| * | | | | | | | | object-name: diagnose trees in index properly | Derrick Stolee | 2022-04-26 | 1 | -6/+12 |
| * | | | | | | | | object-name: reject trees found in the index | Derrick Stolee | 2022-04-26 | 1 | -9/+2 |
| * | | | | | | | | show: integrate with the sparse index | Derrick Stolee | 2022-04-26 | 1 | -4/+20 |
| * | | | | | | | | t1092: add compatibility tests for 'git show' | Derrick Stolee | 2022-04-26 | 1 | -0/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'vd/sparse-stash' | Junio C Hamano | 2022-05-21 | 2 | -1/+79 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | unpack-trees: preserve index sparsity | Victoria Dye | 2022-05-11 | 1 | -1/+1 |
| * | | | | | | | | stash: apply stash using 'merge_ort_nonrecursive()' | Victoria Dye | 2022-05-11 | 1 | -2/+2 |
| * | | | | | | | | read-cache: set sparsity when index is new | Victoria Dye | 2022-05-11 | 1 | -1/+1 |
| * | | | | | | | | stash: integrate with sparse index | Victoria Dye | 2022-05-11 | 1 | -1/+28 |
| * | | | | | | | | stash: expand sparse-checkout compatibility testing | Victoria Dye | 2022-05-11 | 2 | -0/+51 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'cd/bisect-messages-from-pre-flight-states' | Junio C Hamano | 2022-05-21 | 1 | -0/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bisect: output bisect setup status in bisect log | Chris Down | 2022-05-11 | 1 | -0/+10 |
| * | | | | | | | | bisect: output state before we are ready to compute bisection | Chris Down | 2022-05-11 | 1 | -0/+18 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'rs/format-patch-pathspec-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -2/+31 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rs/fast-export-pathspec-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/show-pathspec-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-tree-stdin-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'gc/submodule-update-part2' into maint | Junio C Hamano | 2022-05-05 | 1 | -0/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | |