summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 2.30-rc2v2.30.0-rc2Junio C Hamano2020-12-232-1/+6
* Merge branch 'nk/refspecs-negative-fix'Junio C Hamano2020-12-232-3/+64
|\
| * negative-refspec: improve comment on query_matches_negative_refspecNipunn Koorapati2020-12-221-0/+6
| * negative-refspec: fix segfault on : refspecNipunn Koorapati2020-12-222-3/+58
* | Merge branch 'ma/maintenance-crontab-fix'Junio C Hamano2020-12-233-5/+20
|\ \
| * | t7900-maintenance: test for magic markersMartin Ågren2020-12-211-0/+9
| * | gc: fix handling of crontab magic markersMartin Ågren2020-12-212-4/+10
| * | git-maintenance.txt: add missing wordMartin Ågren2020-12-211-1/+1
* | | Merge branch 'dl/checkout-p-merge-base'Junio C Hamano2020-12-232-2/+9
|\ \ \
| * | | checkout -p: handle tree arguments correctly againJohannes Schindelin2020-12-212-2/+9
* | | | Merge branch 'js/no-more-prepare-for-main-in-test'Junio C Hamano2020-12-2311-619/+621
|\ \ \ \
| * | | | tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereqJohannes Schindelin2020-12-171-8/+0
| * | | | t9902: use `main` as initial branch nameJohannes Schindelin2020-12-171-154/+155
| * | | | t6302: use `main` as initial branch nameJohannes Schindelin2020-12-171-29/+30
| * | | | t5703: use `main` as initial branch nameJohannes Schindelin2020-12-171-32/+33
| * | | | t5510: use `main` as initial branch nameJohannes Schindelin2020-12-171-83/+85
| * | | | t5505: finalize transitioning to using the branch name `main`Johannes Schindelin2020-12-171-78/+78
| * | | | t3205: finalize transitioning to using the branch name `main`Johannes Schindelin2020-12-171-4/+5
| * | | | t3203: complete the transition to using the branch name `main`Johannes Schindelin2020-12-171-21/+22
| * | | | t3201: finalize transitioning to using the branch name `main`Johannes Schindelin2020-12-171-41/+42
| * | | | t3200: finish transitioning to the initial branch name `main`Johannes Schindelin2020-12-171-132/+133
| * | | | t1400: use `main` as initial branch nameJohannes Schindelin2020-12-171-37/+38
* | | | | Merge branch 'jx/pack-redundant-on-single-pack'Junio C Hamano2020-12-232-4/+39
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | pack-redundant: fix crash when one packfile in repoJiang Xin2020-12-172-4/+39
* | | | | Git 2.30-rc1v2.30.0-rc1Junio C Hamano2020-12-192-1/+5
* | | | | Merge branch 'jc/diff-I-status-fix'Junio C Hamano2020-12-192-1/+26
|\ \ \ \ \
| * | | | | diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano2020-12-172-1/+26
* | | | | | Merge branch 'es/perf-export-fix'Junio C Hamano2020-12-191-2/+7
|\ \ \ \ \ \
| * | | | | | t/perf: fix test_export() failure with BSD `sed`Eric Sunshine2020-12-161-2/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rb/nonstop-config-mak-uname-update'Junio C Hamano2020-12-191-4/+0
|\ \ \ \ \ \
| * | | | | | config.mak.uname: remove old NonStop compatibility settingsRandall S. Becker2020-12-171-4/+0
| |/ / / / /
* | | | | | Merge branch 'ab/unreachable-break'Junio C Hamano2020-12-192-3/+0
|\ \ \ \ \ \
| * | | | | | style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason2020-12-162-3/+0
| |/ / / / /
* | | | | | Merge branch 'jc/strmap-remove-typefix'Junio C Hamano2020-12-191-2/+2
|\ \ \ \ \ \
| * | | | | | strmap: make callers of strmap_remove() to call it in void contextJunio C Hamano2020-12-161-2/+2
* | | | | | | Merge branch 'jc/compat-util-setitimer-fix'Junio C Hamano2020-12-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | compat-util: pretend that stub setitimer() always succeedsJunio C Hamano2020-12-161-1/+1
* | | | | | | | Merge branch 'dd/doc-p4-requirements-update'Junio C Hamano2020-12-192-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: mention Python 3.x supportsĐoàn Trần Công Danh2020-12-152-3/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'js/init-defaultbranch-advice'Junio C Hamano2020-12-1910-20/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | init: provide useful advice about init.defaultBranchJohannes Schindelin2020-12-144-4/+29
| * | | | | | | | get_default_branch_name(): prepare for showing some adviceJohannes Schindelin2020-12-145-11/+14
| * | | | | | | | branch -m: allow renaming a yet-unborn branchJohannes Schindelin2020-12-142-1/+11
| * | | | | | | | init: document `init.defaultBranch` betterJohannes Schindelin2020-12-141-4/+7
* | | | | | | | | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-12-196-1397/+1711
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sh/inactive-background'Pratyush Yadav2020-12-182-16/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | git-gui: use gray background for inactive text widgetsStefan Haller2020-12-182-16/+37
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'st/selected-text-colors'Pratyush Yadav2020-12-171-2/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | git-gui: Fix selected text colorsSerg Tereshchenko2020-12-171-2/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'rj/clean-speedup'Pratyush Yadav2020-12-171-0/+2
| |\ \ \ \ \ \ \ \ \