Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | receive-pack: use bug() and BUG_if_bug() | Ævar Arnfjörð Bjarmason | 2022-06-02 | 1 | -10/+6 |
* | Merge branch 'js/use-builtin-add-i' | Junio C Hamano | 2022-05-31 | 1 | -10/+5 |
|\ | |||||
| * | add -i: default to the built-in implementation | Johannes Schindelin | 2021-12-01 | 1 | -10/+5 |
* | | Merge branch 'ac/remote-v-with-object-list-filters' | Junio C Hamano | 2022-05-26 | 1 | -5/+13 |
|\ \ | |||||
| * | | builtin/remote.c: teach `-v` to list filters for promisor remotes | Abhradeep Chakraborty | 2022-05-09 | 1 | -5/+13 |
* | | | Merge branch 'tk/simple-autosetupmerge' | Junio C Hamano | 2022-05-26 | 1 | -13/+51 |
|\ \ \ | |||||
| * | | | push: new config option "push.autoSetupRemote" supports "simple" push | Tao Klerks | 2022-04-29 | 1 | -8/+36 |
| * | | | branch: new autosetupmerge option 'simple' for matching branches | Tao Klerks | 2022-04-29 | 1 | -5/+15 |
* | | | | Merge branch 'tb/receive-pack-code-cleanup' | Junio C Hamano | 2022-05-26 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | builtin/receive-pack.c: remove redundant 'if' | Taylor Blau | 2022-05-18 | 1 | -2/+1 |
* | | | | | Merge branch 'jc/avoid-redundant-submodule-fetch' | Junio C Hamano | 2022-05-26 | 1 | -1/+15 |
|\ \ \ \ \ | |||||
| * | | | | | fetch: do not run a redundant fetch from submodule | Junio C Hamano | 2022-05-18 | 1 | -1/+15 |
* | | | | | | Merge branch 'os/fetch-check-not-current-branch' | Junio C Hamano | 2022-05-26 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fetch: limit shared symref check only for local branches | Orgad Shaneh | 2022-05-16 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/show-branch-g-current' | Junio C Hamano | 2022-05-26 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | show-branch: -g and --current are incompatible | Junio C Hamano | 2022-04-21 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ab/commit-plug-leaks' | Junio C Hamano | 2022-05-23 | 1 | -3/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: fix "author_ident" leak | Junio C Hamano | 2022-05-13 | 1 | -3/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ep/maint-equals-null-cocci' | Junio C Hamano | 2022-05-21 | 16 | -27/+27 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 | Junio C Hamano | 2022-05-02 | 16 | -27/+27 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | tree-wide: apply equals-null.cocci | Junio C Hamano | 2022-05-02 | 16 | -27/+27 |
* | | | | | | | Merge branch 'ds/sparse-colon-path' | Junio C Hamano | 2022-05-21 | 2 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse: integrate with sparse index | Derrick Stolee | 2022-04-26 | 1 | -0/+3 |
| * | | | | | | | show: integrate with the sparse index | Derrick Stolee | 2022-04-26 | 1 | -0/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'vd/sparse-stash' | Junio C Hamano | 2022-05-21 | 1 | -6/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: apply stash using 'merge_ort_nonrecursive()' | Victoria Dye | 2022-05-11 | 1 | -6/+24 |
| * | | | | | | | stash: integrate with sparse index | Victoria Dye | 2022-05-11 | 1 | -0/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'cd/bisect-messages-from-pre-flight-states' | Junio C Hamano | 2022-05-21 | 1 | -13/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bisect: output bisect setup status in bisect log | Chris Down | 2022-05-11 | 1 | -5/+21 |
| * | | | | | | | bisect: output state before we are ready to compute bisection | Chris Down | 2022-05-11 | 1 | -13/+40 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'rs/format-patch-pathspec-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -7/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rs/fast-export-pathspec-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/show-pathspec-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -5/+18 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/name-rev-fix-free-after-use' into maint | Junio C Hamano | 2022-05-05 | 1 | -16/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-tree-stdin-fix' into maint | Junio C Hamano | 2022-05-05 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'gc/submodule-update-part2' into maint | Junio C Hamano | 2022-05-05 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'gc/pull-recurse-submodules' | Junio C Hamano | 2022-05-21 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pull: do not let submodule.recurse override fetch.recurseSubmodules | Glen Choo | 2022-05-12 | 1 | -3/+7 |
* | | | | | | | | | | | | | Merge branch 'gf/unused-includes' | Junio C Hamano | 2022-05-21 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | apply.c: remove unnecessary include | Garrit Franke | 2022-04-06 | 1 | -1/+0 |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'ea/rebase-code-simplify' | Junio C Hamano | 2022-05-11 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rebase: simplify an assignment of options.type in cmd_rebase | Edmundo Carmona Antoranz | 2022-04-20 | 1 | -4/+2 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'ah/rebase-keep-base-fix' | Junio C Hamano | 2022-05-11 | 1 | -27/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rebase: use correct base for --keep-base when a branch is given | Alex Henrie | 2022-04-21 | 1 | -27/+28 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'ea/progress-partial-blame' | Junio C Hamano | 2022-05-11 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | blame: report correct number of lines in progress when using ranges | Edmundo Carmona Antoranz | 2022-04-06 | 1 | -1/+5 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'ds/midx-normalize-pathname-before-comparison' | Junio C Hamano | 2022-05-04 | 1 | -11/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | multi-pack-index: use --object-dir real path | Derrick Stolee | 2022-04-25 | 1 | -11/+34 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'jc/clone-remote-name-leak-fix' | Junio C Hamano | 2022-05-04 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | clone: plug a miniscule leak | Junio C Hamano | 2022-05-01 | 1 | -1/+3 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | |